DevApp/Gs.DevApp/App.config
@@ -28,14 +28,14 @@ </assemblyBinding> </runtime> <appSettings> <!--<add key="WebApiUrl" value="http://localhost:5263/" />--> <add key="WebApiUrl" value="http://192.168.1.145:81/" /> <add key="WebApiUrl" value="http://localhost:5263/" /> <!--<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" /> <add key="Version" value="0.1" /> <add key="IsAutoUpdater" value="0" /> <add key="AutoUpdaterXml" value="https://dianbei.top/AutoUpdater/AutoUpdater.xml" /> <add key="AutoUpdaterXml" value="http://192.168.1.145:86/AutoUpdater/AutoUpdater.xml" /> </appSettings> <userSettings> <Gs.DevApp.Properties.Settings> DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs
@@ -59,7 +59,6 @@ this.gv_releaseNo = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_lotNo = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_lifnr = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -87,10 +86,13 @@ 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(); this.txt_msg = new Gs.DevApp.UserControl.UcDictionary(); this.txt_suppId = new Gs.DevApp.UserControl.UcLookCustomer(); this.lbGuid = new System.Windows.Forms.Label(); this.txt_fngHandle = new DevExpress.XtraEditors.TextEdit(); this.txt_remarks = new DevExpress.XtraEditors.TextEdit(); this.txt_fcheckResu = new DevExpress.XtraEditors.TextEdit(); this.txt_releaseNo = new DevExpress.XtraEditors.TextEdit(); @@ -113,10 +115,6 @@ this.txt_createBy = new DevExpress.XtraEditors.TextEdit(); this.txt_createDate = new DevExpress.XtraEditors.TextEdit(); this.txt_itemName = new DevExpress.XtraEditors.TextEdit(); this.txt_fzrIdTxt = new DevExpress.XtraEditors.TextEdit(); this.txt_mrmodeTxt = new DevExpress.XtraEditors.TextEdit(); this.txt_freceQty = new DevExpress.XtraEditors.TextEdit(); this.txt_zrType = new DevExpress.XtraEditors.TextEdit(); this.txt_kbList = new DevExpress.XtraEditors.ButtonEdit(); this.txt_lotNo = new DevExpress.XtraEditors.ButtonEdit(); this.txt_lineName = new DevExpress.XtraEditors.TextEdit(); @@ -128,23 +126,12 @@ this.txt_itemId1111 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); this.Root = new DevExpress.XtraLayout.LayoutControlGroup(); this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem(); @@ -160,6 +147,12 @@ this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem(); this.txt_lineName111 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem(); 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.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl(); this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); this.splitMx2 = new DevExpress.XtraEditors.SplitContainerControl(); @@ -225,6 +218,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.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); @@ -245,6 +242,7 @@ this.splitMx1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit(); this.layoutMx1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.txt_zrType.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_remarks.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckResu.Properties)).BeginInit(); @@ -268,10 +266,6 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_fzrIdTxt.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_mrmodeTxt.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_freceQty.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_zrType.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_kbList.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_lotNo.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_lineName.Properties)).BeginInit(); @@ -283,23 +277,12 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_itemId1111)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit(); @@ -315,6 +298,12 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_lineName111)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit(); ((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.xtraTabControl2)).BeginInit(); this.xtraTabControl2.SuspendLayout(); this.tabMxPage1.SuspendLayout(); @@ -358,6 +347,10 @@ ((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView4)).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(); this.SuspendLayout(); // // repositoryItemComboBox1 @@ -450,7 +443,6 @@ this.gv_releaseNo, this.gridColumn5, this.gridColumn8, this.gridColumn6, this.gv_lotNo, this.gridColumn23, this.gv_lifnr, @@ -528,16 +520,6 @@ this.gridColumn8.VisibleIndex = 3; this.gridColumn8.Width = 94; // // gridColumn6 // this.gridColumn6.Caption = "判定结果"; this.gridColumn6.FieldName = "freceQty"; this.gridColumn6.MinWidth = 25; this.gridColumn6.Name = "gridColumn6"; this.gridColumn6.Visible = true; this.gridColumn6.VisibleIndex = 4; this.gridColumn6.Width = 94; // // gv_lotNo // this.gv_lotNo.AppearanceCell.Options.UseFont = true; @@ -548,7 +530,7 @@ this.gv_lotNo.OptionsColumn.AllowEdit = false; this.gv_lotNo.Tag = "query_a.lot_no"; this.gv_lotNo.Visible = true; this.gv_lotNo.VisibleIndex = 5; this.gv_lotNo.VisibleIndex = 4; this.gv_lotNo.Width = 120; // // gridColumn23 @@ -558,7 +540,7 @@ this.gridColumn23.MinWidth = 25; this.gridColumn23.Name = "gridColumn23"; this.gridColumn23.Visible = true; this.gridColumn23.VisibleIndex = 6; this.gridColumn23.VisibleIndex = 5; this.gridColumn23.Width = 94; // // gv_lifnr @@ -571,7 +553,7 @@ this.gv_lifnr.OptionsColumn.AllowEdit = false; this.gv_lifnr.Tag = "query_a.lifnr"; this.gv_lifnr.Visible = true; this.gv_lifnr.VisibleIndex = 7; this.gv_lifnr.VisibleIndex = 6; this.gv_lifnr.Width = 200; // // gv_itemId @@ -584,7 +566,7 @@ this.gv_itemId.OptionsColumn.AllowEdit = false; this.gv_itemId.Tag = "query_a.item_id"; this.gv_itemId.Visible = true; this.gv_itemId.VisibleIndex = 8; this.gv_itemId.VisibleIndex = 7; this.gv_itemId.Width = 30; // // gv_itemNo @@ -597,7 +579,7 @@ this.gv_itemNo.OptionsColumn.AllowEdit = false; this.gv_itemNo.Tag = "query_a.item_no"; this.gv_itemNo.Visible = true; this.gv_itemNo.VisibleIndex = 9; this.gv_itemNo.VisibleIndex = 8; this.gv_itemNo.Width = 136; // // gv_boardStyle @@ -610,7 +592,7 @@ this.gv_boardStyle.OptionsColumn.AllowEdit = false; this.gv_boardStyle.Tag = "query_a.board_style"; this.gv_boardStyle.Visible = true; this.gv_boardStyle.VisibleIndex = 10; this.gv_boardStyle.VisibleIndex = 9; this.gv_boardStyle.Width = 164; // // gridColumn14 @@ -621,7 +603,7 @@ this.gridColumn14.Name = "gridColumn14"; this.gridColumn14.OptionsColumn.ReadOnly = true; this.gridColumn14.Visible = true; this.gridColumn14.VisibleIndex = 11; this.gridColumn14.VisibleIndex = 10; this.gridColumn14.Width = 200; // // gv_fcovertQty @@ -635,7 +617,7 @@ this.gv_fcovertQty.OptionsColumn.ReadOnly = true; this.gv_fcovertQty.Tag = "query_a.fcovert_qty"; this.gv_fcovertQty.Visible = true; this.gv_fcovertQty.VisibleIndex = 12; this.gv_fcovertQty.VisibleIndex = 11; this.gv_fcovertQty.Width = 60; // // gv_fbatchQty @@ -648,7 +630,7 @@ this.gv_fbatchQty.OptionsColumn.AllowEdit = false; this.gv_fbatchQty.Tag = "query_a.fbatch_qty"; this.gv_fbatchQty.Visible = true; this.gv_fbatchQty.VisibleIndex = 13; this.gv_fbatchQty.VisibleIndex = 12; this.gv_fbatchQty.Width = 80; // // gv_fcheckResu @@ -661,7 +643,7 @@ this.gv_fcheckResu.OptionsColumn.AllowEdit = false; this.gv_fcheckResu.Tag = "query_a.fcheck_resu"; this.gv_fcheckResu.Visible = true; this.gv_fcheckResu.VisibleIndex = 14; this.gv_fcheckResu.VisibleIndex = 13; this.gv_fcheckResu.Width = 50; // // gv_remarks @@ -674,7 +656,7 @@ this.gv_remarks.OptionsColumn.AllowEdit = false; this.gv_remarks.Tag = "query_a.remarks"; this.gv_remarks.Visible = true; this.gv_remarks.VisibleIndex = 15; this.gv_remarks.VisibleIndex = 14; this.gv_remarks.Width = 100; // // gv_fcheckBy @@ -687,7 +669,7 @@ this.gv_fcheckBy.OptionsColumn.AllowEdit = false; this.gv_fcheckBy.Tag = "query_a.fcheck_by"; this.gv_fcheckBy.Visible = true; this.gv_fcheckBy.VisibleIndex = 16; this.gv_fcheckBy.VisibleIndex = 15; this.gv_fcheckBy.Width = 118; // // gv_fcheckDate @@ -700,7 +682,7 @@ this.gv_fcheckDate.OptionsColumn.AllowEdit = false; this.gv_fcheckDate.Tag = "query_a.fcheck_date"; this.gv_fcheckDate.Visible = true; this.gv_fcheckDate.VisibleIndex = 17; this.gv_fcheckDate.VisibleIndex = 16; this.gv_fcheckDate.Width = 182; // // gv_createBy @@ -713,7 +695,7 @@ this.gv_createBy.OptionsColumn.AllowEdit = false; this.gv_createBy.Tag = "query_a.create_by"; this.gv_createBy.Visible = true; this.gv_createBy.VisibleIndex = 18; this.gv_createBy.VisibleIndex = 17; this.gv_createBy.Width = 67; // // gridColumn15 @@ -723,7 +705,7 @@ this.gridColumn15.MinWidth = 25; this.gridColumn15.Name = "gridColumn15"; this.gridColumn15.Visible = true; this.gridColumn15.VisibleIndex = 19; this.gridColumn15.VisibleIndex = 18; this.gridColumn15.Width = 94; // // gv_lastupdateBy @@ -736,7 +718,7 @@ this.gv_lastupdateBy.OptionsColumn.AllowEdit = false; this.gv_lastupdateBy.Tag = "query_a.lastupdate_by"; this.gv_lastupdateBy.Visible = true; this.gv_lastupdateBy.VisibleIndex = 20; this.gv_lastupdateBy.VisibleIndex = 19; this.gv_lastupdateBy.Width = 60; // // gv_lastupdateDate @@ -749,7 +731,7 @@ this.gv_lastupdateDate.OptionsColumn.AllowEdit = false; this.gv_lastupdateDate.Tag = "query_a.lastupdate_date"; this.gv_lastupdateDate.Visible = true; this.gv_lastupdateDate.VisibleIndex = 21; this.gv_lastupdateDate.VisibleIndex = 20; this.gv_lastupdateDate.Width = 120; // // gridColumn18 @@ -759,7 +741,7 @@ this.gridColumn18.MinWidth = 25; this.gridColumn18.Name = "gridColumn18"; this.gridColumn18.Visible = true; this.gridColumn18.VisibleIndex = 22; this.gridColumn18.VisibleIndex = 21; this.gridColumn18.Width = 94; // // gridColumn19 @@ -769,7 +751,7 @@ this.gridColumn19.MinWidth = 25; this.gridColumn19.Name = "gridColumn19"; this.gridColumn19.Visible = true; this.gridColumn19.VisibleIndex = 23; this.gridColumn19.VisibleIndex = 22; this.gridColumn19.Width = 94; // // gridColumn30 @@ -787,7 +769,7 @@ this.gridColumn13.MinWidth = 25; this.gridColumn13.Name = "gridColumn13"; this.gridColumn13.Visible = true; this.gridColumn13.VisibleIndex = 24; this.gridColumn13.VisibleIndex = 23; this.gridColumn13.Width = 94; // // gridColumn17 @@ -805,7 +787,7 @@ this.gridColumn7.MinWidth = 25; this.gridColumn7.Name = "gridColumn7"; this.gridColumn7.Visible = true; this.gridColumn7.VisibleIndex = 25; this.gridColumn7.VisibleIndex = 24; this.gridColumn7.Width = 94; // // pageBar1 @@ -850,10 +832,13 @@ // // 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); this.layoutMx1.Controls.Add(this.txt_msg); this.layoutMx1.Controls.Add(this.txt_suppId); this.layoutMx1.Controls.Add(this.lbGuid); this.layoutMx1.Controls.Add(this.txt_fngHandle); this.layoutMx1.Controls.Add(this.txt_remarks); this.layoutMx1.Controls.Add(this.txt_fcheckResu); this.layoutMx1.Controls.Add(this.txt_releaseNo); @@ -876,10 +861,6 @@ this.layoutMx1.Controls.Add(this.txt_createBy); this.layoutMx1.Controls.Add(this.txt_createDate); this.layoutMx1.Controls.Add(this.txt_itemName); this.layoutMx1.Controls.Add(this.txt_fzrIdTxt); this.layoutMx1.Controls.Add(this.txt_mrmodeTxt); this.layoutMx1.Controls.Add(this.txt_freceQty); this.layoutMx1.Controls.Add(this.txt_zrType); this.layoutMx1.Controls.Add(this.txt_kbList); this.layoutMx1.Controls.Add(this.txt_lotNo); this.layoutMx1.Controls.Add(this.txt_lineName); @@ -900,12 +881,66 @@ 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.Name = "txt_fzrId"; this.txt_fzrId.Size = new System.Drawing.Size(256, 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.Name = "txt_zrType"; this.txt_zrType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); this.txt_zrType.Properties.Items.AddRange(new object[] { "-请选择-", "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.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.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:挑选使用"}); 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.StyleController = this.layoutMx1; this.txt_fngHandle.TabIndex = 837; // // txt_msg // this.txt_msg.BtnTxt = "违规类别"; this.txt_msg.Location = new System.Drawing.Point(672, 186); this.txt_msg.Location = new System.Drawing.Point(1002, 12); this.txt_msg.Name = "txt_msg"; this.txt_msg.Size = new System.Drawing.Size(326, 54); this.txt_msg.Size = new System.Drawing.Size(328, 83); this.txt_msg.TabIndex = 814; this.txt_msg.TextTxt = ""; this.txt_msg.WhereTxt = null; @@ -926,15 +961,6 @@ this.lbGuid.TabIndex = 1; this.lbGuid.Text = "lbGuid"; this.lbGuid.Visible = false; // // txt_fngHandle // this.txt_fngHandle.Location = new System.Drawing.Point(1074, 128); this.txt_fngHandle.Name = "txt_fngHandle"; this.txt_fngHandle.Size = new System.Drawing.Size(256, 24); this.txt_fngHandle.StyleController = this.layoutMx1; this.txt_fngHandle.TabIndex = 801; this.txt_fngHandle.Tag = "readonly"; // // txt_remarks // @@ -1027,28 +1053,28 @@ // // txt_fsubmitBy // this.txt_fsubmitBy.Location = new System.Drawing.Point(1074, 41); this.txt_fsubmitBy.Location = new System.Drawing.Point(744, 215); this.txt_fsubmitBy.Name = "txt_fsubmitBy"; this.txt_fsubmitBy.Size = new System.Drawing.Size(256, 24); this.txt_fsubmitBy.Size = new System.Drawing.Size(254, 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(1074, 12); this.txt_fsubmitDate.Location = new System.Drawing.Point(744, 186); this.txt_fsubmitDate.Name = "txt_fsubmitDate"; this.txt_fsubmitDate.Size = new System.Drawing.Size(256, 24); this.txt_fsubmitDate.Size = new System.Drawing.Size(254, 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(1002, 70); this.txt_fsubmit.Location = new System.Drawing.Point(672, 244); this.txt_fsubmit.Name = "txt_fsubmit"; this.txt_fsubmit.Properties.Caption = "审核标识"; this.txt_fsubmit.Size = new System.Drawing.Size(328, 24); this.txt_fsubmit.Size = new System.Drawing.Size(326, 24); this.txt_fsubmit.StyleController = this.layoutMx1; this.txt_fsubmit.TabIndex = 806; this.txt_fsubmit.Tag = "readonly"; @@ -1101,7 +1127,7 @@ this.txt_workNo.Size = new System.Drawing.Size(256, 24); this.txt_workNo.StyleController = this.layoutMx1; this.txt_workNo.TabIndex = 816; this.txt_workNo.Tag = "readonly"; this.txt_workNo.Tag = ""; // // txt_checkStates // @@ -1150,44 +1176,6 @@ this.txt_itemName.StyleController = this.layoutMx1; this.txt_itemName.TabIndex = 825; this.txt_itemName.Tag = "readonly"; // // txt_fzrIdTxt // this.txt_fzrIdTxt.Location = new System.Drawing.Point(1074, 157); this.txt_fzrIdTxt.Name = "txt_fzrIdTxt"; this.txt_fzrIdTxt.Size = new System.Drawing.Size(256, 24); this.txt_fzrIdTxt.StyleController = this.layoutMx1; this.txt_fzrIdTxt.TabIndex = 826; this.txt_fzrIdTxt.Tag = "readonly"; // // txt_mrmodeTxt // this.txt_mrmodeTxt.Location = new System.Drawing.Point(1074, 215); this.txt_mrmodeTxt.Name = "txt_mrmodeTxt"; this.txt_mrmodeTxt.Size = new System.Drawing.Size(256, 24); this.txt_mrmodeTxt.StyleController = this.layoutMx1; this.txt_mrmodeTxt.TabIndex = 827; this.txt_mrmodeTxt.Tag = "readonly"; // // txt_freceQty // this.txt_freceQty.Location = new System.Drawing.Point(1074, 99); this.txt_freceQty.Name = "txt_freceQty"; this.txt_freceQty.Properties.Appearance.ForeColor = System.Drawing.Color.Blue; this.txt_freceQty.Properties.Appearance.Options.UseForeColor = true; this.txt_freceQty.Size = new System.Drawing.Size(256, 24); this.txt_freceQty.StyleController = this.layoutMx1; this.txt_freceQty.TabIndex = 828; this.txt_freceQty.Tag = "readonly"; // // txt_zrType // this.txt_zrType.Location = new System.Drawing.Point(1074, 244); this.txt_zrType.Name = "txt_zrType"; this.txt_zrType.Size = new System.Drawing.Size(256, 24); this.txt_zrType.StyleController = this.layoutMx1; this.txt_zrType.TabIndex = 829; this.txt_zrType.Tag = "readonly"; // // txt_kbList // @@ -1296,23 +1284,12 @@ this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; this.Root.GroupBordersVisible = false; this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.layoutControlItem23, this.layoutControlItem16, this.layoutControlItem15, this.layoutControlItem14, this.layoutControlItem26, this.layoutControlItem13, this.layoutControlItem7, this.layoutControlItem25, this.layoutControlItem29, this.layoutControlItem27, this.layoutControlItem31, this.layoutControlItem10, this.layoutControlItem32, this.layoutControlItem8, this.layoutControlItem33, this.layoutControlItem2, this.layoutControlItem35, this.layoutControlItem12, this.layoutControlItem6, this.layoutControlItem34, @@ -1327,7 +1304,17 @@ this.txt_epTagtxt, this.layoutControlItem18, this.txt_lineName111, this.layoutControlItem30}); this.layoutControlItem30, this.layoutControlItem23, this.layoutControlItem13, this.layoutControlItem7, this.layoutControlItem35, this.layoutControlItem29, this.layoutControlItem25, this.layoutControlItem16, this.layoutControlItem15, this.layoutControlItem14, this.layoutControlItem27}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; @@ -1373,117 +1360,6 @@ rowDefinition9}); this.Root.Size = new System.Drawing.Size(1342, 282); this.Root.TextVisible = false; // // layoutControlItem23 // 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.Text = "单据类型"; this.layoutControlItem23.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem16 // this.layoutControlItem16.Control = this.txt_fsubmitDate; this.layoutControlItem16.Location = new System.Drawing.Point(990, 0); this.layoutControlItem16.Name = "layoutControlItem16"; this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem16.Size = new System.Drawing.Size(332, 29); 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(990, 29); this.layoutControlItem15.Name = "layoutControlItem15"; this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem15.Size = new System.Drawing.Size(332, 29); 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(990, 58); this.layoutControlItem14.Name = "layoutControlItem14"; this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem14.Size = new System.Drawing.Size(332, 29); this.layoutControlItem14.Text = "审核标识"; this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem14.TextVisible = false; // // layoutControlItem26 // this.layoutControlItem26.Control = this.txt_freceQty; this.layoutControlItem26.Location = new System.Drawing.Point(990, 87); this.layoutControlItem26.Name = "layoutControlItem26"; this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 3; this.layoutControlItem26.Size = new System.Drawing.Size(332, 29); this.layoutControlItem26.Text = "判定结果"; this.layoutControlItem26.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem13 // this.layoutControlItem13.Control = this.txt_fngHandle; this.layoutControlItem13.Location = new System.Drawing.Point(990, 116); this.layoutControlItem13.Name = "layoutControlItem13"; this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 4; this.layoutControlItem13.Size = new System.Drawing.Size(332, 29); this.layoutControlItem13.Text = "处置结果"; this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem7 // this.layoutControlItem7.Control = this.txt_fzrIdTxt; this.layoutControlItem7.Location = new System.Drawing.Point(990, 145); this.layoutControlItem7.Name = "layoutControlItem7"; this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 5; this.layoutControlItem7.Size = new System.Drawing.Size(332, 29); this.layoutControlItem7.Text = "责任人员"; this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem25 // this.layoutControlItem25.Control = this.txt_mrmodeTxt; this.layoutControlItem25.CustomizationFormText = "返工工序"; 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); // // layoutControlItem29 // this.layoutControlItem29.Control = this.txt_workNo; this.layoutControlItem29.Location = new System.Drawing.Point(990, 174); this.layoutControlItem29.Name = "layoutControlItem29"; this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 6; this.layoutControlItem29.Size = new System.Drawing.Size(332, 29); this.layoutControlItem29.Text = "返工单号"; this.layoutControlItem29.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem27 // this.layoutControlItem27.Control = this.txt_msg; this.layoutControlItem27.Location = new System.Drawing.Point(660, 174); this.layoutControlItem27.Name = "layoutControlItem27"; this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 6; this.layoutControlItem27.OptionsTableLayoutItem.RowSpan = 2; this.layoutControlItem27.Size = new System.Drawing.Size(330, 58); this.layoutControlItem27.Text = "违规类别"; this.layoutControlItem27.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem27.TextVisible = false; // // layoutControlItem31 // @@ -1549,17 +1425,6 @@ this.layoutControlItem2.Size = new System.Drawing.Size(330, 29); this.layoutControlItem2.Text = "检验日期"; this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem35 // this.layoutControlItem35.Control = this.txt_zrType; this.layoutControlItem35.Location = new System.Drawing.Point(990, 232); this.layoutControlItem35.Name = "layoutControlItem35"; this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem35.OptionsTableLayoutItem.RowIndex = 8; this.layoutControlItem35.Size = new System.Drawing.Size(332, 30); this.layoutControlItem35.Text = "责任判定"; this.layoutControlItem35.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem12 // @@ -1720,6 +1585,70 @@ this.layoutControlItem30.Size = new System.Drawing.Size(330, 29); this.layoutControlItem30.Text = "送检数量"; this.layoutControlItem30.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem23 // 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.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.Name = "layoutControlItem13"; this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3; this.layoutControlItem13.Size = new System.Drawing.Size(332, 29); 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.Name = "layoutControlItem7"; this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 4; this.layoutControlItem7.Size = new System.Drawing.Size(332, 29); 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.Name = "layoutControlItem35"; this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem35.OptionsTableLayoutItem.RowIndex = 5; this.layoutControlItem35.Size = new System.Drawing.Size(332, 29); this.layoutControlItem35.Text = "责任人"; this.layoutControlItem35.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem29 // this.layoutControlItem29.Control = this.txt_workNo; this.layoutControlItem29.Location = new System.Drawing.Point(990, 174); this.layoutControlItem29.Name = "layoutControlItem29"; this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 6; this.layoutControlItem29.Size = new System.Drawing.Size(332, 29); 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); // // xtraTabControl2 // @@ -2473,6 +2402,52 @@ // this.gridView4.Name = "gridView4"; // // layoutControlItem16 // this.layoutControlItem16.Control = this.txt_fsubmitDate; this.layoutControlItem16.Location = new System.Drawing.Point(660, 174); 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.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.Name = "layoutControlItem15"; this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 7; this.layoutControlItem15.Size = new System.Drawing.Size(330, 29); 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.Name = "layoutControlItem27"; this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem27.OptionsTableLayoutItem.RowSpan = 3; this.layoutControlItem27.Size = new System.Drawing.Size(332, 87); this.layoutControlItem27.Text = "违规类别"; this.layoutControlItem27.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem27.TextVisible = false; // // Frm_FqcDetect01 // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); @@ -2503,6 +2478,7 @@ this.splitMx1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit(); this.layoutMx1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.txt_zrType.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_remarks.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckResu.Properties)).EndInit(); @@ -2526,10 +2502,6 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_fzrIdTxt.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_mrmodeTxt.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_freceQty.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_zrType.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_kbList.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_lotNo.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_lineName.Properties)).EndInit(); @@ -2541,23 +2513,12 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_itemId1111)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit(); @@ -2573,6 +2534,12 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_lineName111)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit(); ((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.xtraTabControl2)).EndInit(); this.xtraTabControl2.ResumeLayout(false); this.tabMxPage1.ResumeLayout(false); @@ -2616,6 +2583,10 @@ ((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView4)).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(); this.ResumeLayout(false); } @@ -2650,7 +2621,6 @@ private DevExpress.XtraGrid.Views.Grid.GridView gridView2; private DevExpress.XtraGrid.Views.Grid.GridView gridView3; private DevExpress.XtraGrid.Views.Grid.GridView gridView4; private DevExpress.XtraEditors.TextEdit txt_fngHandle; private DevExpress.XtraEditors.TextEdit txt_fcheckResu; private DevExpress.XtraEditors.TextEdit txt_remarks; private DevExpress.XtraEditors.TextEdit txt_itemNo; @@ -2735,7 +2705,6 @@ private UserControl.UcLookCustomer txt_suppId; private UserControl.UcDictionary txt_msg; private DevExpress.XtraEditors.TextEdit txt_workNo; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23; private DevExpress.XtraEditors.TextEdit txt_checkStates; private DevExpress.XtraEditors.ComboBoxEdit txt_epTag; private DevExpress.XtraEditors.TextEdit txt_createBy; @@ -2743,21 +2712,8 @@ private DevExpress.XtraEditors.TextEdit txt_itemName; private DevExpress.XtraGrid.Columns.GridColumn gridColumn13; private UserControl.UCUpFileList ucUpFileList1; private DevExpress.XtraGrid.Columns.GridColumn gridColumn6; private DevExpress.XtraGrid.Columns.GridColumn gridColumn7; private DevExpress.Utils.ToolTipController tips; private DevExpress.XtraEditors.TextEdit txt_fzrIdTxt; private DevExpress.XtraEditors.TextEdit txt_mrmodeTxt; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14; private DevExpress.XtraEditors.TextEdit txt_freceQty; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32; @@ -2770,8 +2726,6 @@ private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptDefectLevel; private DevExpress.XtraGrid.Columns.GridColumn gridColumn10; private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptDefectDetails; private DevExpress.XtraEditors.TextEdit txt_zrType; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem35; private DevExpress.XtraEditors.ButtonEdit txt_kbList; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6; @@ -2797,5 +2751,19 @@ private DevExpress.XtraLayout.LayoutControlItem txt_itemId1111; private DevExpress.XtraLayout.LayoutControlItem txt_lineName111; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem30; 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; } } DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
@@ -14,6 +14,7 @@ { public partial class Frm_FqcDetect01 : DevExpress.XtraEditors.XtraForm { string _strTag= "N:不合格"; string _webServiceName = "FqcManager/"; List<FilterEntity> _filterList = new List<FilterEntity>(); public Frm_FqcDetect01() @@ -70,7 +71,6 @@ txt_lineId.Text = lst[0].lineId; txt_checkStates.Text = "W:未知"; txt_fcheckResu.Text = "W:未知"; txt_freceQty.Text = "W:未知"; } catch (Exception ex) { @@ -314,14 +314,70 @@ } if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定提交检验吗？")) return; if (txt_fcheckResu.Text.Trim() == "不合格") if (txt_fcheckResu.Text.Trim() == _strTag) { if (string.IsNullOrEmpty(txt_msg.TextTxt.Trim())) { MsgHelper.Warning("单据为不合格时，请填写违规信息！"); return; } string _txt_fngHandle = txt_fngHandle.Text.Trim(); string _txt_fmrmode = txt_fmrmode.GetCode(); 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("请选择处置结果！"); txt_fngHandle.Focus(); return; } if (txt_zrType.SelectedIndex <= 0) { Gs.DevApp.ToolBox.MsgHelper.Warning("请选择责任判定！"); txt_zrType.Focus(); return; } if (_txt_fzrId.Length <= 0) { Gs.DevApp.ToolBox.MsgHelper.Warning("请选择责任人！"); 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_fmrmode)) { Gs.DevApp.ToolBox.MsgHelper.Warning("请填选择反工工序！"); txt_fmrmode.Focus(); return; } } else { if (!string.IsNullOrEmpty(_txt_workNo)) { Gs.DevApp.ToolBox.MsgHelper.Warning("不需要填写反工单号！"); txt_workNo.Focus(); return; } if (!string.IsNullOrEmpty(_txt_fmrmode)) { Gs.DevApp.ToolBox.MsgHelper.Warning("不需要选择反工工序！"); txt_fmrmode.Focus(); return; } } }; var _obj = new { guid = rowGuid, @@ -498,18 +554,114 @@ txt_djType.Focus(); return; } if (string.IsNullOrEmpty(_txt_fbatchQty.Trim())) { Gs.DevApp.ToolBox.MsgHelper.Warning("抽检数量不能为空！"); txt_fbatchQty.Focus(); return; } if (string.IsNullOrEmpty(_txt_lotNo.Trim())) { Gs.DevApp.ToolBox.MsgHelper.Warning("工单号不能为空！"); txt_lotNo.Focus(); return; } if (string.IsNullOrEmpty(_kbList.Trim())) { Gs.DevApp.ToolBox.MsgHelper.Warning("送检箱码不能为空！"); txt_kbList.Focus(); return; } if (string.IsNullOrEmpty(txt_kbSl.Text.Trim())) { Gs.DevApp.ToolBox.MsgHelper.Warning("送检数量不能为空！"); txt_kbList.Focus(); return; } if (string.IsNullOrEmpty(_txt_fbatchQty.Trim())) { Gs.DevApp.ToolBox.MsgHelper.Warning("抽检数量不能为空！"); txt_fbatchQty.Focus(); return; } if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric2(_txt_fbatchQty)) { Gs.DevApp.ToolBox.MsgHelper.Warning("请输入正确的抽检数量！"); txt_fbatchQty.Focus(); return; } if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric2(txt_kbSl.Text.Trim())) { Gs.DevApp.ToolBox.MsgHelper.Warning("请输入正确的送检数量！"); 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("抽检数量不能大于送检数量！"); txt_fbatchQty.Focus(); return; } //当不合格时的检查 string _txt_fngHandle = txt_fngHandle.Text.Trim(); string _txt_fmrmode = txt_fmrmode.GetCode(); string _txt_fzrId = txt_fzrId.GetId(); string _txt_workNo = txt_workNo.Text.Trim(); string _txt_zrType = txt_zrType.Text.Trim(); if (txt_fcheckResu.Text.Trim() == _strTag) { if (string.IsNullOrEmpty(txt_msg.TextTxt.Trim())) { MsgHelper.Warning("当不合格时，请填写违规信息！"); txt_msg.Focus(); return; } if (txt_fngHandle.SelectedIndex <= 0) { Gs.DevApp.ToolBox.MsgHelper.Warning("当不合格时，请选择处置结果！"); txt_fngHandle.Focus(); return; } if (txt_zrType.SelectedIndex <= 0) { Gs.DevApp.ToolBox.MsgHelper.Warning("当不合格时，请选择责任判定！"); txt_zrType.Focus(); return; } if (_txt_fzrId.Length <= 0) { Gs.DevApp.ToolBox.MsgHelper.Warning("当不合格时，请选择责任人！"); 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_fmrmode)) { Gs.DevApp.ToolBox.MsgHelper.Warning("当不合格时，请填选择反工工序！"); txt_fmrmode.Focus(); return; } } else { if (!string.IsNullOrEmpty(_txt_workNo)) { Gs.DevApp.ToolBox.MsgHelper.Warning("不需要填写反工单号！"); txt_workNo.Focus(); return; } if (!string.IsNullOrEmpty(_txt_fmrmode)) { Gs.DevApp.ToolBox.MsgHelper.Warning("不需要选择反工工序！"); txt_fmrmode.Focus(); return; } } }; var _obj = new { guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //主建 @@ -525,8 +677,12 @@ fmanageNo = _txt_fmanageNo,//流程编号 lotNo1 = _txt_lotNo1,//送检批号 lotNo = _txt_lotNo,//生产工单 edtType = 0, kbList = _kbList, fngHandle = _txt_fngHandle, fzrId = _txt_fzrId, workNo = _txt_workNo, fmrmode = _txt_fmrmode, zrType = _txt_zrType, list = new List<dynamic>(), }; gvMx1.CloseEditor(); @@ -541,7 +697,7 @@ string _defectLevel = row["defectLevel"].ToString(); string _defectDetails = row["defectDetails"].ToString(); string _fcheckResu = row["fcheckResu"].ToString(); if (_fcheckResu == "不合格") if (_fcheckResu == _strTag) { if (string.IsNullOrEmpty(_defectLevel)) { DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.Designer.cs
@@ -110,7 +110,6 @@ this.txt_itemId = new DevExpress.XtraEditors.TextEdit(); this.txt_suppId = new DevExpress.XtraEditors.TextEdit(); this.txt_fngHandle = new DevExpress.XtraEditors.ComboBoxEdit(); this.txt_freceQty = new DevExpress.XtraEditors.ComboBoxEdit(); this.txt_zrType = new DevExpress.XtraEditors.ComboBoxEdit(); this.txt_kbSl = new DevExpress.XtraEditors.TextEdit(); this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem(); @@ -128,13 +127,7 @@ this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem(); @@ -202,6 +195,11 @@ 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.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); @@ -249,7 +247,6 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_suppId.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_freceQty.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_zrType.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_kbSl.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit(); @@ -267,13 +264,7 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit(); @@ -319,6 +310,11 @@ ((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit(); this.SuspendLayout(); // // repositoryItemComboBox1 @@ -820,7 +816,6 @@ this.layoutMx1.Controls.Add(this.txt_itemId); this.layoutMx1.Controls.Add(this.txt_suppId); this.layoutMx1.Controls.Add(this.txt_fngHandle); this.layoutMx1.Controls.Add(this.txt_freceQty); this.layoutMx1.Controls.Add(this.txt_zrType); this.layoutMx1.Controls.Add(this.txt_kbSl); this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill; @@ -849,7 +844,7 @@ // txt_fmrmode // this.txt_fmrmode.IsReadly = false; this.txt_fmrmode.Location = new System.Drawing.Point(1074, 236); this.txt_fmrmode.Location = new System.Drawing.Point(1074, 208); 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); @@ -859,7 +854,7 @@ // txt_fzrId // this.txt_fzrId.IsReadly = false; this.txt_fzrId.Location = new System.Drawing.Point(1074, 180); this.txt_fzrId.Location = new System.Drawing.Point(1074, 152); this.txt_fzrId.Name = "txt_fzrId"; this.txt_fzrId.Size = new System.Drawing.Size(256, 24); this.txt_fzrId.TabIndex = 812; @@ -1045,7 +1040,7 @@ // // txt_workNo // this.txt_workNo.Location = new System.Drawing.Point(1074, 208); this.txt_workNo.Location = new System.Drawing.Point(1074, 180); this.txt_workNo.Name = "txt_workNo"; this.txt_workNo.Size = new System.Drawing.Size(256, 24); this.txt_workNo.StyleController = this.layoutMx1; @@ -1130,7 +1125,7 @@ // txt_fngHandle // this.txt_fngHandle.EditValue = "-请选择-"; this.txt_fngHandle.Location = new System.Drawing.Point(1074, 124); this.txt_fngHandle.Location = new System.Drawing.Point(1074, 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)}); @@ -1144,28 +1139,10 @@ this.txt_fngHandle.StyleController = this.layoutMx1; this.txt_fngHandle.TabIndex = 829; // // txt_freceQty // this.txt_freceQty.EditValue = "-请选择-"; this.txt_freceQty.Location = new System.Drawing.Point(1074, 96); this.txt_freceQty.Name = "txt_freceQty"; this.txt_freceQty.Properties.Appearance.ForeColor = System.Drawing.Color.Blue; this.txt_freceQty.Properties.Appearance.Options.UseForeColor = true; this.txt_freceQty.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); this.txt_freceQty.Properties.Items.AddRange(new object[] { "-请选择-", "Y:合格", "N:不合格"}); this.txt_freceQty.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; this.txt_freceQty.Size = new System.Drawing.Size(256, 24); this.txt_freceQty.StyleController = this.layoutMx1; this.txt_freceQty.TabIndex = 830; // // txt_zrType // this.txt_zrType.EditValue = "-请选择-"; this.txt_zrType.Location = new System.Drawing.Point(1074, 152); this.txt_zrType.Location = new System.Drawing.Point(1074, 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)}); @@ -1235,13 +1212,7 @@ this.layoutControlItem16, this.layoutControlItem15, this.layoutControlItem14, this.layoutControlItem13, this.layoutControlItem11, this.layoutControlItem23, this.layoutControlItem26, this.layoutControlItem29, this.layoutControlItem25, this.layoutControlItem35, this.layoutControlItem7, this.layoutControlItem28, this.layoutControlItem10, @@ -1254,7 +1225,12 @@ this.layoutControlItem5, this.layoutControlItem34, this.layoutControlItem6, this.layoutControlItem12}); this.layoutControlItem12, this.layoutControlItem11, this.layoutControlItem35, this.layoutControlItem25, this.layoutControlItem29, this.layoutControlItem26}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; @@ -1286,7 +1262,7 @@ rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition8.Height = 100D; rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition9.Height = 28D; rowDefinition9.Height = 24D; rowDefinition9.SizeType = System.Windows.Forms.SizeType.AutoSize; this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { rowDefinition1, @@ -1298,7 +1274,7 @@ rowDefinition7, rowDefinition8, rowDefinition9}); this.Root.Size = new System.Drawing.Size(1342, 272); this.Root.Size = new System.Drawing.Size(1342, 268); this.Root.TextVisible = false; // // layoutControlItem3 @@ -1425,29 +1401,6 @@ this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem14.TextVisible = false; // // layoutControlItem13 // this.layoutControlItem13.Control = this.txt_freceQty; this.layoutControlItem13.Location = new System.Drawing.Point(990, 84); this.layoutControlItem13.Name = "layoutControlItem13"; this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3; this.layoutControlItem13.Size = new System.Drawing.Size(332, 28); this.layoutControlItem13.Text = "判定结果"; this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem11 // this.layoutControlItem11.Control = this.txt_fngHandle; this.layoutControlItem11.CustomizationFormText = "处置结果"; this.layoutControlItem11.Location = new System.Drawing.Point(990, 112); this.layoutControlItem11.Name = "layoutControlItem11"; this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 4; this.layoutControlItem11.Size = new System.Drawing.Size(332, 28); this.layoutControlItem11.Text = "处置结果"; this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem23 // this.layoutControlItem23.Control = this.txt_djType; @@ -1456,52 +1409,6 @@ this.layoutControlItem23.Size = new System.Drawing.Size(330, 28); this.layoutControlItem23.Text = "单据类型"; this.layoutControlItem23.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem26 // this.layoutControlItem26.Control = this.txt_fmrmode; this.layoutControlItem26.Location = new System.Drawing.Point(990, 224); this.layoutControlItem26.Name = "layoutControlItem26"; this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 8; this.layoutControlItem26.Size = new System.Drawing.Size(332, 28); this.layoutControlItem26.Text = "返工工序"; this.layoutControlItem26.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem29 // this.layoutControlItem29.Control = this.txt_workNo; this.layoutControlItem29.Location = new System.Drawing.Point(990, 196); this.layoutControlItem29.Name = "layoutControlItem29"; this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 7; this.layoutControlItem29.Size = new System.Drawing.Size(332, 28); this.layoutControlItem29.Text = "返工单号"; this.layoutControlItem29.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem25 // this.layoutControlItem25.Control = this.txt_fzrId; this.layoutControlItem25.Location = new System.Drawing.Point(990, 168); this.layoutControlItem25.Name = "layoutControlItem25"; this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 6; this.layoutControlItem25.Size = new System.Drawing.Size(332, 28); this.layoutControlItem25.Text = "责任人"; this.layoutControlItem25.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem35 // this.layoutControlItem35.Control = this.txt_zrType; this.layoutControlItem35.ControlAlignment = System.Drawing.ContentAlignment.TopLeft; this.layoutControlItem35.CustomizationFormText = "责任判定"; this.layoutControlItem35.Location = new System.Drawing.Point(990, 140); this.layoutControlItem35.Name = "layoutControlItem35"; this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem35.OptionsTableLayoutItem.RowIndex = 5; this.layoutControlItem35.Size = new System.Drawing.Size(332, 28); this.layoutControlItem35.Text = "判定责任"; this.layoutControlItem35.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem7 // @@ -2243,6 +2150,64 @@ // this.gridView4.Name = "gridView4"; // // layoutControlItem11 // this.layoutControlItem11.Control = this.txt_fngHandle; this.layoutControlItem11.CustomizationFormText = "处置结果"; this.layoutControlItem11.Location = new System.Drawing.Point(990, 84); this.layoutControlItem11.Name = "layoutControlItem11"; this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 3; this.layoutControlItem11.Size = new System.Drawing.Size(332, 28); this.layoutControlItem11.Text = "处置结果"; this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem35 // this.layoutControlItem35.Control = this.txt_zrType; this.layoutControlItem35.ControlAlignment = System.Drawing.ContentAlignment.TopLeft; this.layoutControlItem35.CustomizationFormText = "责任判定"; this.layoutControlItem35.Location = new System.Drawing.Point(990, 112); this.layoutControlItem35.Name = "layoutControlItem35"; this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem35.OptionsTableLayoutItem.RowIndex = 4; this.layoutControlItem35.Size = new System.Drawing.Size(332, 28); this.layoutControlItem35.Text = "判定责任"; this.layoutControlItem35.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem25 // this.layoutControlItem25.Control = this.txt_fzrId; this.layoutControlItem25.Location = new System.Drawing.Point(990, 140); this.layoutControlItem25.Name = "layoutControlItem25"; this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 5; this.layoutControlItem25.Size = new System.Drawing.Size(332, 28); this.layoutControlItem25.Text = "责任人"; this.layoutControlItem25.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem29 // this.layoutControlItem29.Control = this.txt_workNo; this.layoutControlItem29.Location = new System.Drawing.Point(990, 168); this.layoutControlItem29.Name = "layoutControlItem29"; this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 6; this.layoutControlItem29.Size = new System.Drawing.Size(332, 28); this.layoutControlItem29.Text = "返工单号"; this.layoutControlItem29.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem26 // this.layoutControlItem26.Control = this.txt_fmrmode; this.layoutControlItem26.Location = new System.Drawing.Point(990, 196); this.layoutControlItem26.Name = "layoutControlItem26"; this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 7; this.layoutControlItem26.Size = new System.Drawing.Size(332, 28); this.layoutControlItem26.Text = "返工工序"; this.layoutControlItem26.TextSize = new System.Drawing.Size(60, 18); // // Frm_FqcDetect01Check // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); @@ -2300,7 +2265,6 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_suppId.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_freceQty.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_zrType.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_kbSl.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit(); @@ -2318,13 +2282,7 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit(); @@ -2370,6 +2328,11 @@ ((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit(); this.ResumeLayout(false); } @@ -2499,22 +2462,15 @@ private DevExpress.XtraEditors.TextEdit txt_suppId; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4; private DevExpress.XtraEditors.ComboBoxEdit txt_fngHandle; private DevExpress.XtraEditors.ComboBoxEdit txt_freceQty; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11; private DevExpress.XtraGrid.Columns.GridColumn gridColumn5; private DevExpress.XtraEditors.ComboBoxEdit txt_zrType; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem35; private DevExpress.XtraGrid.Columns.GridColumn gridColumn6; private DevExpress.XtraGrid.Columns.GridColumn gridColumn8; private DevExpress.XtraEditors.TextEdit txt_kbSl; @@ -2534,5 +2490,10 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12; private DevExpress.XtraTab.XtraTabPage tabMxPage2; private UcChouJianList ucChouJianList1; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem35; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26; } } DevApp/Gs.DevApp/DevFrm/FQC/MesFqcExceptional.Designer.cs
@@ -53,26 +53,23 @@ this.split1 = new DevExpress.XtraEditors.SplitContainerControl(); this.gcMain1 = new DevExpress.XtraGrid.GridControl(); this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.gv_fstatus = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_checkUser = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_pba005 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_pba006 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_pba009 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn(); this.pageBar1 = new UserControls.Data.UcPageBar(); this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl(); @@ -361,46 +358,29 @@ this.gridView1.Appearance.Row.Options.UseFont = true; this.gridView1.ColumnPanelRowHeight = 50; this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { this.gv_fstatus, this.gridColumn4, this.gridColumn1, this.gridColumn2, this.gv_checkUser, this.gv_checkDate, this.gv_pba005, this.gv_pba006, this.gv_pba009, this.gridColumn5, this.gridColumn3, this.gridColumn6, this.gridColumn7, this.gridColumn8, this.gridColumn9, this.gridColumn10, this.gridColumn11, this.gridColumn12, this.gridColumn13, this.gridColumn14}); this.gridColumn14, this.gridColumn15, this.gridColumn16, this.gridColumn17, this.gridColumn18, this.gridColumn3, this.gridColumn5, this.gridColumn6, this.gridColumn7, this.gridColumn11}); this.gridView1.GridControl = this.gcMain1; this.gridView1.IndicatorWidth = 50; this.gridView1.Name = "gridView1"; this.gridView1.OptionsFind.ShowSearchNavButtons = false; this.gridView1.OptionsView.ShowAutoFilterRow = true; this.gridView1.OptionsView.ShowGroupPanel = false; // // gv_fstatus // this.gv_fstatus.AppearanceCell.Options.UseFont = true; this.gv_fstatus.Caption = "审核标识"; this.gv_fstatus.FieldName = "chkStatus"; this.gv_fstatus.MaxWidth = 50; this.gv_fstatus.MinWidth = 50; this.gv_fstatus.Name = "gv_fstatus"; this.gv_fstatus.OptionsColumn.AllowEdit = false; this.gv_fstatus.Tag = "query_a.fstatus"; this.gv_fstatus.Visible = true; this.gv_fstatus.VisibleIndex = 0; this.gv_fstatus.Width = 50; // // gridColumn4 // @@ -417,7 +397,7 @@ this.gridColumn1.MinWidth = 25; this.gridColumn1.Name = "gridColumn1"; this.gridColumn1.Visible = true; this.gridColumn1.VisibleIndex = 1; this.gridColumn1.VisibleIndex = 4; this.gridColumn1.Width = 94; // // gridColumn2 @@ -427,7 +407,7 @@ this.gridColumn2.Name = "gridColumn2"; this.gridColumn2.OptionsColumn.AllowEdit = false; this.gridColumn2.Visible = true; this.gridColumn2.VisibleIndex = 2; this.gridColumn2.VisibleIndex = 5; this.gridColumn2.Width = 150; // // gv_checkUser @@ -439,94 +419,8 @@ this.gv_checkUser.OptionsColumn.AllowEdit = false; this.gv_checkUser.Tag = "query_a.check_user"; this.gv_checkUser.Visible = true; this.gv_checkUser.VisibleIndex = 3; this.gv_checkUser.VisibleIndex = 6; this.gv_checkUser.Width = 94; // // gv_checkDate // this.gv_checkDate.AppearanceCell.Options.UseFont = true; this.gv_checkDate.Caption = "审核者"; this.gv_checkDate.FieldName = "checkBy"; this.gv_checkDate.Name = "gv_checkDate"; this.gv_checkDate.OptionsColumn.AllowEdit = false; this.gv_checkDate.Tag = "query_a.check_date"; this.gv_checkDate.Visible = true; this.gv_checkDate.VisibleIndex = 4; this.gv_checkDate.Width = 180; // // gv_pba005 // this.gv_pba005.AppearanceCell.Options.UseFont = true; this.gv_pba005.Caption = "审核时间"; this.gv_pba005.FieldName = "checkDate"; this.gv_pba005.Name = "gv_pba005"; this.gv_pba005.OptionsColumn.AllowEdit = false; this.gv_pba005.Tag = "query_a.pba005"; this.gv_pba005.Visible = true; this.gv_pba005.VisibleIndex = 5; this.gv_pba005.Width = 94; // // gv_pba006 // this.gv_pba006.AppearanceCell.Options.UseFont = true; this.gv_pba006.Caption = "处置意见"; this.gv_pba006.FieldName = "handSuggestion"; this.gv_pba006.Name = "gv_pba006"; this.gv_pba006.OptionsColumn.AllowEdit = false; this.gv_pba006.Tag = "query_a.pba006"; this.gv_pba006.Visible = true; this.gv_pba006.VisibleIndex = 6; this.gv_pba006.Width = 180; // // gv_pba009 // this.gv_pba009.AppearanceCell.Options.UseFont = true; this.gv_pba009.Caption = "选别类别"; this.gv_pba009.FieldName = "chooseType"; this.gv_pba009.Name = "gv_pba009"; this.gv_pba009.OptionsColumn.AllowEdit = false; this.gv_pba009.Tag = "query_a.pba009"; this.gv_pba009.Visible = true; this.gv_pba009.VisibleIndex = 7; this.gv_pba009.Width = 100; // // gridColumn5 // this.gridColumn5.Caption = "选别数量"; this.gridColumn5.FieldName = "chooseQty"; this.gridColumn5.MinWidth = 25; this.gridColumn5.Name = "gridColumn5"; this.gridColumn5.Width = 94; // // gridColumn3 // this.gridColumn3.Caption = "选别良品数"; this.gridColumn3.FieldName = "chooseGoodQty"; this.gridColumn3.MinWidth = 25; this.gridColumn3.Name = "gridColumn3"; this.gridColumn3.Visible = true; this.gridColumn3.VisibleIndex = 8; this.gridColumn3.Width = 94; // // gridColumn6 // this.gridColumn6.Caption = "选别不良品数"; this.gridColumn6.FieldName = "chooseBadQty"; this.gridColumn6.MinWidth = 25; this.gridColumn6.Name = "gridColumn6"; this.gridColumn6.Visible = true; this.gridColumn6.VisibleIndex = 9; this.gridColumn6.Width = 94; // // gridColumn7 // this.gridColumn7.Caption = "判定结果"; this.gridColumn7.FieldName = "handResult"; this.gridColumn7.MinWidth = 25; this.gridColumn7.Name = "gridColumn7"; this.gridColumn7.Visible = true; this.gridColumn7.VisibleIndex = 10; this.gridColumn7.Width = 94; // // gridColumn8 // @@ -534,8 +428,6 @@ this.gridColumn8.FieldName = "itemNo"; this.gridColumn8.MinWidth = 25; this.gridColumn8.Name = "gridColumn8"; this.gridColumn8.Visible = true; this.gridColumn8.VisibleIndex = 11; this.gridColumn8.Width = 94; // // gridColumn9 @@ -545,7 +437,7 @@ this.gridColumn9.MinWidth = 25; this.gridColumn9.Name = "gridColumn9"; this.gridColumn9.Visible = true; this.gridColumn9.VisibleIndex = 12; this.gridColumn9.VisibleIndex = 7; this.gridColumn9.Width = 94; // // gridColumn10 @@ -554,39 +446,7 @@ this.gridColumn10.FieldName = "itemModel"; this.gridColumn10.MinWidth = 25; this.gridColumn10.Name = "gridColumn10"; this.gridColumn10.Visible = true; this.gridColumn10.VisibleIndex = 13; this.gridColumn10.Width = 94; // // gridColumn11 // this.gridColumn11.Caption = "供应商"; this.gridColumn11.FieldName = "gysName"; this.gridColumn11.MinWidth = 25; this.gridColumn11.Name = "gridColumn11"; this.gridColumn11.Visible = true; this.gridColumn11.VisibleIndex = 14; this.gridColumn11.Width = 94; // // gridColumn12 // this.gridColumn12.Caption = "到货日期"; this.gridColumn12.FieldName = "dhdDate"; this.gridColumn12.MinWidth = 25; this.gridColumn12.Name = "gridColumn12"; this.gridColumn12.Visible = true; this.gridColumn12.VisibleIndex = 15; this.gridColumn12.Width = 94; // // gridColumn13 // this.gridColumn13.Caption = "到货单号"; this.gridColumn13.FieldName = "dhdNo"; this.gridColumn13.MinWidth = 25; this.gridColumn13.Name = "gridColumn13"; this.gridColumn13.Visible = true; this.gridColumn13.VisibleIndex = 16; this.gridColumn13.Width = 94; // // gridColumn14 // @@ -595,8 +455,98 @@ this.gridColumn14.MinWidth = 25; this.gridColumn14.Name = "gridColumn14"; this.gridColumn14.Visible = true; this.gridColumn14.VisibleIndex = 17; this.gridColumn14.VisibleIndex = 11; this.gridColumn14.Width = 94; // // gridColumn15 // this.gridColumn15.Caption = "线别"; this.gridColumn15.FieldName = "lineName"; this.gridColumn15.MinWidth = 25; this.gridColumn15.Name = "gridColumn15"; this.gridColumn15.Visible = true; this.gridColumn15.VisibleIndex = 0; this.gridColumn15.Width = 94; // // gridColumn16 // this.gridColumn16.Caption = "生产工单"; this.gridColumn16.FieldName = "daaNo"; this.gridColumn16.MinWidth = 25; this.gridColumn16.Name = "gridColumn16"; this.gridColumn16.Visible = true; this.gridColumn16.VisibleIndex = 8; this.gridColumn16.Width = 94; // // gridColumn17 // this.gridColumn17.Caption = "问题等级"; this.gridColumn17.FieldName = "wtdj"; this.gridColumn17.MinWidth = 25; this.gridColumn17.Name = "gridColumn17"; this.gridColumn17.Visible = true; this.gridColumn17.VisibleIndex = 2; this.gridColumn17.Width = 94; // // gridColumn18 // this.gridColumn18.Caption = "不良原因"; this.gridColumn18.FieldName = "wtMs"; this.gridColumn18.MinWidth = 25; this.gridColumn18.Name = "gridColumn18"; this.gridColumn18.Visible = true; this.gridColumn18.VisibleIndex = 3; this.gridColumn18.Width = 94; // // gridColumn3 // this.gridColumn3.Caption = "检验人"; this.gridColumn3.FieldName = "jyUser"; this.gridColumn3.MinWidth = 25; this.gridColumn3.Name = "gridColumn3"; this.gridColumn3.Visible = true; this.gridColumn3.VisibleIndex = 9; this.gridColumn3.Width = 94; // // gridColumn5 // this.gridColumn5.Caption = "检验日期"; this.gridColumn5.FieldName = "jyDate"; this.gridColumn5.MinWidth = 25; this.gridColumn5.Name = "gridColumn5"; this.gridColumn5.Visible = true; this.gridColumn5.VisibleIndex = 10; this.gridColumn5.Width = 94; // // gridColumn6 // this.gridColumn6.Caption = "责任人"; this.gridColumn6.FieldName = "fzrName"; this.gridColumn6.MinWidth = 25; this.gridColumn6.Name = "gridColumn6"; this.gridColumn6.Visible = true; this.gridColumn6.VisibleIndex = 12; this.gridColumn6.Width = 94; // // gridColumn7 // this.gridColumn7.Caption = "责任判定"; this.gridColumn7.FieldName = "zrType"; this.gridColumn7.MinWidth = 25; this.gridColumn7.Name = "gridColumn7"; this.gridColumn7.Visible = true; this.gridColumn7.VisibleIndex = 13; this.gridColumn7.Width = 94; // // gridColumn11 // this.gridColumn11.Caption = "异常单号"; this.gridColumn11.FieldName = "fBillNo"; this.gridColumn11.MinWidth = 25; this.gridColumn11.Name = "gridColumn11"; this.gridColumn11.Visible = true; this.gridColumn11.VisibleIndex = 1; this.gridColumn11.Width = 94; // // pageBar1 // @@ -1708,7 +1658,7 @@ this.Controls.Add(this.xtraTabControl1); this.Controls.Add(this.toolBarMenu1); this.Name = "MesFqcExceptional"; this.Text = "IQC异常报告"; this.Text = "FQC异常报告"; ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit(); this.xtraTabControl1.ResumeLayout(false); this.xtraTabPage1.ResumeLayout(false); @@ -1832,28 +1782,16 @@ private DevExpress.XtraEditors.SplitContainerControl split1; private DevExpress.XtraGrid.GridControl gcMain1; private DevExpress.XtraGrid.Views.Grid.GridView gridView1; private DevExpress.XtraGrid.Columns.GridColumn gv_fstatus; private DevExpress.XtraGrid.Columns.GridColumn gridColumn4; private DevExpress.XtraGrid.Columns.GridColumn gridColumn1; private DevExpress.XtraGrid.Columns.GridColumn gridColumn2; private DevExpress.XtraGrid.Columns.GridColumn gv_checkUser; private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate; private DevExpress.XtraGrid.Columns.GridColumn gv_pba005; private DevExpress.XtraGrid.Columns.GridColumn gv_pba006; private DevExpress.XtraGrid.Columns.GridColumn gv_pba009; private UserControls.Data.UcPageBar pageBar1; private DevExpress.XtraGrid.Columns.GridColumn gridColumn5; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10; private DevExpress.XtraGrid.Columns.GridColumn gridColumn3; private DevExpress.XtraGrid.Columns.GridColumn gridColumn6; private DevExpress.XtraGrid.Columns.GridColumn gridColumn7; private DevExpress.XtraGrid.Columns.GridColumn gridColumn8; private DevExpress.XtraGrid.Columns.GridColumn gridColumn9; private DevExpress.XtraGrid.Columns.GridColumn gridColumn10; private DevExpress.XtraGrid.Columns.GridColumn gridColumn11; private DevExpress.XtraGrid.Columns.GridColumn gridColumn12; private DevExpress.XtraGrid.Columns.GridColumn gridColumn13; private DevExpress.XtraGrid.Columns.GridColumn gridColumn14; private DevExpress.Utils.ToolTipController tips; private DevExpress.XtraTab.XtraTabPage xtraTabPage2; @@ -1951,5 +1889,14 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20; private DevExpress.XtraGrid.Columns.GridColumn gridColumn15; private DevExpress.XtraGrid.Columns.GridColumn gridColumn16; private DevExpress.XtraGrid.Columns.GridColumn gridColumn17; private DevExpress.XtraGrid.Columns.GridColumn gridColumn18; private DevExpress.XtraGrid.Columns.GridColumn gridColumn3; private DevExpress.XtraGrid.Columns.GridColumn gridColumn5; private DevExpress.XtraGrid.Columns.GridColumn gridColumn6; private DevExpress.XtraGrid.Columns.GridColumn gridColumn7; private DevExpress.XtraGrid.Columns.GridColumn gridColumn11; } } DevApp/Gs.DevApp/DevFrm/FQC/MesFqcExceptional.cs
@@ -12,7 +12,7 @@ { public partial class MesFqcExceptional : DevExpress.XtraEditors.XtraForm { string _webServiceName = "MesQcExceptionalManager/"; string _webServiceName = "FqcExceptionalManager/"; List<FilterEntity> _filterList = new List<FilterEntity>(); public MesFqcExceptional() { DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
@@ -14,6 +14,7 @@ { public partial class Frm_MesQaItemsDetect01 : DevExpress.XtraEditors.XtraForm { string _strTag = "N:不合格"; string _webServiceName = "MesQaItemsDetect01Manager/"; List<FilterEntity> _filterList = new List<FilterEntity>(); public Frm_MesQaItemsDetect01() @@ -248,7 +249,7 @@ } if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定提交检验吗？")) return; if (txt_fcheckResu.Text.Trim() == "不合格") if (txt_fcheckResu.Text.Trim() == _strTag) { if (string.IsNullOrEmpty(txt_fngDesc.Text.Trim())) { @@ -357,7 +358,7 @@ private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e) { toolBarMenu1.isSetBtn = false; if (txt_fcheckResu.Text.Trim() == "N:不合格" && string.IsNullOrEmpty(txt_fngDesc.TextTxt.Trim())) if (txt_fcheckResu.Text.Trim() == _strTag && string.IsNullOrEmpty(txt_fngDesc.TextTxt.Trim())) { Gs.DevApp.ToolBox.MsgHelper.Warning("当检验结果不合格时，请填写备注说明！"); txt_fngDesc.Focus(); DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs
@@ -110,6 +110,7 @@ this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); this.tips = new DevExpress.Utils.ToolTipController(this.components); this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -260,7 +261,8 @@ this.colRole, this.gridColumn4, this.gridColumn5, this.gridColumn1}); this.gridColumn1, this.gridColumn6}); gridFormatRule1.Column = this.isLocked; gridFormatRule1.Name = "Format0"; formatConditionRuleExpression1.Appearance.ForeColor = System.Drawing.Color.Red; @@ -776,6 +778,14 @@ this.layoutControlItem6.Text = "住宿地址"; this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18); // // gridColumn6 // this.gridColumn6.Caption = "主键GUID"; this.gridColumn6.FieldName = "guid"; this.gridColumn6.MinWidth = 25; this.gridColumn6.Name = "gridColumn6"; this.gridColumn6.Width = 94; // // User // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); @@ -881,5 +891,6 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6; private DevExpress.Utils.ToolTipController tips; private DevExpress.XtraGrid.Columns.GridColumn gridColumn6; } } DevApp/Gs.DevApp/DevFrm/User/UserSetPwd.cs
@@ -43,8 +43,7 @@ var _obj = new { edtUserGuid = userGuid, userGuid, userGuid = userGuid, newPass = txtNewPwd.Text.Trim() }; try DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -30,35 +30,35 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.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.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition12 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition13 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition14 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition15 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition16 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition17 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition18 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition19 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition15 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.XtraLayout.ColumnDefinition columnDefinition20 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition21 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition22 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition23 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition24 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition16 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition17 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition25 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition26 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition27 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition28 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition29 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition30 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition18 = new DevExpress.XtraLayout.RowDefinition(); this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu(); this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage(); @@ -68,10 +68,7 @@ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_daa027 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn27 = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -461,10 +458,7 @@ this.gridColumn5, this.gv_daa027, this.gridColumn7, this.gridColumn8, this.gridColumn9, this.gridColumn10, this.gridColumn11, this.gridColumn12, this.gridColumn6, this.gridColumn27, @@ -543,28 +537,6 @@ this.gridColumn7.VisibleIndex = 2; this.gridColumn7.Width = 50; // // gridColumn8 // this.gridColumn8.Caption = "是否三天"; this.gridColumn8.FieldName = "isThree"; this.gridColumn8.MaxWidth = 50; this.gridColumn8.MinWidth = 50; this.gridColumn8.Name = "gridColumn8"; this.gridColumn8.Tag = "query_a.jabs"; this.gridColumn8.Width = 50; // // gridColumn9 // this.gridColumn9.Caption = "是否超时"; this.gridColumn9.FieldName = "isCs"; this.gridColumn9.MaxWidth = 50; this.gridColumn9.MinWidth = 50; this.gridColumn9.Name = "gridColumn9"; this.gridColumn9.Tag = "query_a.jabs"; this.gridColumn9.Visible = true; this.gridColumn9.VisibleIndex = 3; this.gridColumn9.Width = 50; // // gridColumn10 // this.gridColumn10.Caption = "是否首检"; @@ -574,20 +546,8 @@ this.gridColumn10.Name = "gridColumn10"; this.gridColumn10.Tag = "query_a.jabs"; this.gridColumn10.Visible = true; this.gridColumn10.VisibleIndex = 4; this.gridColumn10.VisibleIndex = 3; this.gridColumn10.Width = 50; // // gridColumn11 // this.gridColumn11.Caption = "是否巡检"; this.gridColumn11.FieldName = "isXj"; this.gridColumn11.MaxWidth = 50; this.gridColumn11.MinWidth = 50; this.gridColumn11.Name = "gridColumn11"; this.gridColumn11.Tag = "query_a.jabs"; this.gridColumn11.Visible = true; this.gridColumn11.VisibleIndex = 5; this.gridColumn11.Width = 50; // // gridColumn12 // @@ -598,7 +558,7 @@ this.gridColumn12.Name = "gridColumn12"; this.gridColumn12.Tag = "query_a.jabs"; this.gridColumn12.Visible = true; this.gridColumn12.VisibleIndex = 6; this.gridColumn12.VisibleIndex = 5; this.gridColumn12.Width = 50; // // gridColumn6 @@ -610,7 +570,7 @@ this.gridColumn6.Name = "gridColumn6"; this.gridColumn6.Tag = "query_a.jabs"; this.gridColumn6.Visible = true; this.gridColumn6.VisibleIndex = 7; this.gridColumn6.VisibleIndex = 6; this.gridColumn6.Width = 50; // // gridColumn27 @@ -620,7 +580,7 @@ this.gridColumn27.MinWidth = 25; this.gridColumn27.Name = "gridColumn27"; this.gridColumn27.Visible = true; this.gridColumn27.VisibleIndex = 8; this.gridColumn27.VisibleIndex = 7; this.gridColumn27.Width = 94; // // gv_daa018 @@ -633,7 +593,7 @@ this.gv_daa018.OptionsColumn.AllowEdit = false; this.gv_daa018.Tag = "query_a.daa018"; this.gv_daa018.Visible = true; this.gv_daa018.VisibleIndex = 9; this.gv_daa018.VisibleIndex = 8; this.gv_daa018.Width = 90; // // gridColoun100 @@ -644,7 +604,7 @@ this.gridColoun100.Name = "gridColoun100"; this.gridColoun100.Tag = "org.fnamber"; this.gridColoun100.Visible = true; this.gridColoun100.VisibleIndex = 10; this.gridColoun100.VisibleIndex = 9; this.gridColoun100.Width = 250; // // gv_daa001 @@ -657,7 +617,7 @@ this.gv_daa001.OptionsColumn.AllowEdit = false; this.gv_daa001.Tag = "query_a.daa001"; this.gv_daa001.Visible = true; this.gv_daa001.VisibleIndex = 11; this.gv_daa001.VisibleIndex = 10; this.gv_daa001.Width = 120; // // gv_daa021 @@ -670,7 +630,7 @@ this.gv_daa021.OptionsColumn.AllowEdit = false; this.gv_daa021.Tag = "query_a.daa021"; this.gv_daa021.Visible = true; this.gv_daa021.VisibleIndex = 12; this.gv_daa021.VisibleIndex = 11; this.gv_daa021.Width = 100; // // gridColumn3 @@ -680,7 +640,7 @@ this.gridColumn3.MinWidth = 50; this.gridColumn3.Name = "gridColumn3"; this.gridColumn3.Visible = true; this.gridColumn3.VisibleIndex = 13; this.gridColumn3.VisibleIndex = 12; this.gridColumn3.Width = 94; // // gv_daa003 @@ -693,7 +653,7 @@ this.gv_daa003.OptionsColumn.AllowEdit = false; this.gv_daa003.Tag = "query_a.daa003"; this.gv_daa003.Visible = true; this.gv_daa003.VisibleIndex = 14; this.gv_daa003.VisibleIndex = 13; this.gv_daa003.Width = 150; // // gv_daa004 @@ -706,7 +666,7 @@ this.gv_daa004.OptionsColumn.AllowEdit = false; this.gv_daa004.Tag = "query_a.daa004"; this.gv_daa004.Visible = true; this.gv_daa004.VisibleIndex = 15; this.gv_daa004.VisibleIndex = 14; this.gv_daa004.Width = 150; // // gv_daa008 @@ -720,7 +680,7 @@ this.gv_daa008.OptionsColumn.AllowEdit = false; this.gv_daa008.Tag = "query_a.daa008"; this.gv_daa008.Visible = true; this.gv_daa008.VisibleIndex = 16; this.gv_daa008.VisibleIndex = 15; this.gv_daa008.Width = 50; // // gv_daa011 @@ -734,7 +694,7 @@ this.gv_daa011.OptionsColumn.AllowEdit = false; this.gv_daa011.Tag = "query_a.daa011"; this.gv_daa011.Visible = true; this.gv_daa011.VisibleIndex = 17; this.gv_daa011.VisibleIndex = 16; this.gv_daa011.Width = 50; // // gridColumn4 @@ -745,7 +705,7 @@ this.gridColumn4.MinWidth = 50; this.gridColumn4.Name = "gridColumn4"; this.gridColumn4.Visible = true; this.gridColumn4.VisibleIndex = 18; this.gridColumn4.VisibleIndex = 17; this.gridColumn4.Width = 50; // // gv_daa010 @@ -759,7 +719,7 @@ this.gv_daa010.OptionsColumn.AllowEdit = false; this.gv_daa010.Tag = "query_a.daa010"; this.gv_daa010.Visible = true; this.gv_daa010.VisibleIndex = 20; this.gv_daa010.VisibleIndex = 19; this.gv_daa010.Width = 50; // // gv_daa005 @@ -773,7 +733,7 @@ this.gv_daa005.OptionsColumn.AllowEdit = false; this.gv_daa005.Tag = "query_a.daa005"; this.gv_daa005.Visible = true; this.gv_daa005.VisibleIndex = 21; this.gv_daa005.VisibleIndex = 20; this.gv_daa005.Width = 50; // // gv_cust @@ -786,7 +746,7 @@ this.gv_cust.OptionsColumn.AllowEdit = false; this.gv_cust.Tag = "query_a.cust"; this.gv_cust.Visible = true; this.gv_cust.VisibleIndex = 22; this.gv_cust.VisibleIndex = 21; this.gv_cust.Width = 100; // // gridColumn1 @@ -796,7 +756,7 @@ this.gridColumn1.MinWidth = 50; this.gridColumn1.Name = "gridColumn1"; this.gridColumn1.Visible = true; this.gridColumn1.VisibleIndex = 23; this.gridColumn1.VisibleIndex = 22; this.gridColumn1.Width = 94; // // gv_daa015 @@ -809,7 +769,7 @@ this.gv_daa015.OptionsColumn.AllowEdit = false; this.gv_daa015.Tag = "query_a.daa015"; this.gv_daa015.Visible = true; this.gv_daa015.VisibleIndex = 24; this.gv_daa015.VisibleIndex = 23; this.gv_daa015.Width = 94; // // gv_daa009 @@ -822,7 +782,7 @@ this.gv_daa009.OptionsColumn.AllowEdit = false; this.gv_daa009.Tag = "query_a.daa009"; this.gv_daa009.Visible = true; this.gv_daa009.VisibleIndex = 19; this.gv_daa009.VisibleIndex = 18; this.gv_daa009.Width = 94; // // gv_prepareTime @@ -835,7 +795,7 @@ this.gv_prepareTime.OptionsColumn.AllowEdit = false; this.gv_prepareTime.Tag = "query_a.prepare_time"; this.gv_prepareTime.Visible = true; this.gv_prepareTime.VisibleIndex = 25; this.gv_prepareTime.VisibleIndex = 24; this.gv_prepareTime.Width = 180; // // gv_daa028 @@ -848,7 +808,7 @@ this.gv_daa028.OptionsColumn.AllowEdit = false; this.gv_daa028.Tag = "query_a.daa028"; this.gv_daa028.Visible = true; this.gv_daa028.VisibleIndex = 26; this.gv_daa028.VisibleIndex = 25; this.gv_daa028.Width = 180; // // gv_daa016 @@ -861,7 +821,7 @@ this.gv_daa016.OptionsColumn.AllowEdit = false; this.gv_daa016.Tag = "query_a.daa016"; this.gv_daa016.Visible = true; this.gv_daa016.VisibleIndex = 27; this.gv_daa016.VisibleIndex = 26; this.gv_daa016.Width = 180; // // gv_daa017 @@ -874,7 +834,7 @@ this.gv_daa017.OptionsColumn.AllowEdit = false; this.gv_daa017.Tag = "query_a.daa017"; this.gv_daa017.Visible = true; this.gv_daa017.VisibleIndex = 28; this.gv_daa017.VisibleIndex = 27; this.gv_daa017.Width = 180; // // gv_mesStartProd @@ -887,7 +847,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 = 29; this.gv_mesStartProd.VisibleIndex = 28; this.gv_mesStartProd.Width = 180; // // gv_mesEndProd @@ -900,7 +860,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 = 30; this.gv_mesEndProd.VisibleIndex = 29; this.gv_mesEndProd.Width = 180; // // gridColumn21 @@ -910,7 +870,7 @@ this.gridColumn21.MinWidth = 25; this.gridColumn21.Name = "gridColumn21"; this.gridColumn21.Visible = true; this.gridColumn21.VisibleIndex = 31; this.gridColumn21.VisibleIndex = 30; this.gridColumn21.Width = 94; // // gridColumn22 @@ -920,7 +880,7 @@ this.gridColumn22.MinWidth = 25; this.gridColumn22.Name = "gridColumn22"; this.gridColumn22.Visible = true; this.gridColumn22.VisibleIndex = 32; this.gridColumn22.VisibleIndex = 31; this.gridColumn22.Width = 94; // // gridColumn23 @@ -938,7 +898,7 @@ this.gridColumn24.MinWidth = 25; this.gridColumn24.Name = "gridColumn24"; this.gridColumn24.Visible = true; this.gridColumn24.VisibleIndex = 33; this.gridColumn24.VisibleIndex = 32; this.gridColumn24.Width = 94; // // gridColumn25 @@ -948,7 +908,7 @@ this.gridColumn25.MinWidth = 25; this.gridColumn25.Name = "gridColumn25"; this.gridColumn25.Visible = true; this.gridColumn25.VisibleIndex = 34; this.gridColumn25.VisibleIndex = 33; this.gridColumn25.Width = 94; // // gridColumn26 @@ -958,7 +918,7 @@ this.gridColumn26.MinWidth = 25; this.gridColumn26.Name = "gridColumn26"; this.gridColumn26.Visible = true; this.gridColumn26.VisibleIndex = 35; this.gridColumn26.VisibleIndex = 34; this.gridColumn26.Width = 94; // // pageBar1 @@ -1048,20 +1008,20 @@ // // txt_daa009 // this.txt_daa009.Location = new System.Drawing.Point(425, 152); this.txt_daa009.Location = new System.Drawing.Point(420, 152); this.txt_daa009.Name = "txt_daa009"; this.txt_daa009.Properties.Appearance.Options.UseFont = true; this.txt_daa009.Size = new System.Drawing.Size(518, 24); this.txt_daa009.Size = new System.Drawing.Size(506, 24); this.txt_daa009.StyleController = this.layoutMx1; this.txt_daa009.TabIndex = 240; this.txt_daa009.Tag = ""; // // txt_daa013 // this.txt_daa013.Location = new System.Drawing.Point(737, 124); this.txt_daa013.Location = new System.Drawing.Point(726, 124); this.txt_daa013.Name = "txt_daa013"; this.txt_daa013.Properties.Appearance.Options.UseFont = true; this.txt_daa013.Size = new System.Drawing.Size(206, 24); this.txt_daa013.Size = new System.Drawing.Size(200, 24); this.txt_daa013.StyleController = this.layoutMx1; this.txt_daa013.TabIndex = 472; this.txt_daa013.Tag = "readonly"; @@ -1071,27 +1031,27 @@ this.txt_daa001.Location = new System.Drawing.Point(114, 12); this.txt_daa001.Name = "txt_daa001"; this.txt_daa001.Properties.Appearance.Options.UseFont = true; this.txt_daa001.Size = new System.Drawing.Size(205, 24); this.txt_daa001.Size = new System.Drawing.Size(200, 24); this.txt_daa001.StyleController = this.layoutMx1; this.txt_daa001.TabIndex = 216; this.txt_daa001.Tag = "readonly"; // // textEdit1 // this.textEdit1.Location = new System.Drawing.Point(425, 40); this.textEdit1.Location = new System.Drawing.Point(420, 40); this.textEdit1.Name = "textEdit1"; this.textEdit1.Properties.Appearance.Options.UseFont = true; this.textEdit1.Size = new System.Drawing.Size(206, 24); this.textEdit1.Size = new System.Drawing.Size(200, 24); this.textEdit1.StyleController = this.layoutMx1; this.textEdit1.TabIndex = 467; this.textEdit1.Tag = "readonly"; // // txt_daa008 // this.txt_daa008.Location = new System.Drawing.Point(737, 12); this.txt_daa008.Location = new System.Drawing.Point(726, 12); this.txt_daa008.Name = "txt_daa008"; this.txt_daa008.Properties.Appearance.Options.UseFont = true; this.txt_daa008.Size = new System.Drawing.Size(206, 24); this.txt_daa008.Size = new System.Drawing.Size(200, 24); this.txt_daa008.StyleController = this.layoutMx1; this.txt_daa008.TabIndex = 235; this.txt_daa008.Tag = "readonly"; @@ -1101,27 +1061,27 @@ this.txt_saleOrderNo.Location = new System.Drawing.Point(114, 68); this.txt_saleOrderNo.Name = "txt_saleOrderNo"; this.txt_saleOrderNo.Properties.Appearance.Options.UseFont = true; this.txt_saleOrderNo.Size = new System.Drawing.Size(205, 24); this.txt_saleOrderNo.Size = new System.Drawing.Size(200, 24); this.txt_saleOrderNo.StyleController = this.layoutMx1; this.txt_saleOrderNo.TabIndex = 465; this.txt_saleOrderNo.Tag = "readonly"; // // txt_daa028 // this.txt_daa028.Location = new System.Drawing.Point(425, 68); this.txt_daa028.Location = new System.Drawing.Point(420, 68); this.txt_daa028.Name = "txt_daa028"; this.txt_daa028.Properties.Appearance.Options.UseFont = true; this.txt_daa028.Size = new System.Drawing.Size(206, 24); this.txt_daa028.Size = new System.Drawing.Size(200, 24); this.txt_daa028.StyleController = this.layoutMx1; this.txt_daa028.TabIndex = 341; this.txt_daa028.Tag = "readonly"; // // txt_mesStartProd // this.txt_mesStartProd.Location = new System.Drawing.Point(1049, 40); this.txt_mesStartProd.Location = new System.Drawing.Point(1032, 40); this.txt_mesStartProd.Name = "txt_mesStartProd"; this.txt_mesStartProd.Properties.Appearance.Options.UseFont = true; this.txt_mesStartProd.Size = new System.Drawing.Size(206, 24); this.txt_mesStartProd.Size = new System.Drawing.Size(202, 24); this.txt_mesStartProd.StyleController = this.layoutMx1; this.txt_mesStartProd.TabIndex = 336; this.txt_mesStartProd.Tag = "readonly"; @@ -1131,67 +1091,67 @@ this.txt_daa014.Location = new System.Drawing.Point(114, 40); this.txt_daa014.Name = "txt_daa014"; this.txt_daa014.Properties.Appearance.Options.UseFont = true; this.txt_daa014.Size = new System.Drawing.Size(205, 24); this.txt_daa014.Size = new System.Drawing.Size(200, 24); this.txt_daa014.StyleController = this.layoutMx1; this.txt_daa014.TabIndex = 327; this.txt_daa014.Tag = "readonly"; // // txt_daa022Remark // this.txt_daa022Remark.Location = new System.Drawing.Point(425, 12); this.txt_daa022Remark.Location = new System.Drawing.Point(420, 12); this.txt_daa022Remark.Name = "txt_daa022Remark"; this.txt_daa022Remark.Properties.Appearance.Options.UseFont = true; this.txt_daa022Remark.Size = new System.Drawing.Size(206, 24); this.txt_daa022Remark.Size = new System.Drawing.Size(200, 24); this.txt_daa022Remark.StyleController = this.layoutMx1; this.txt_daa022Remark.TabIndex = 462; this.txt_daa022Remark.Tag = "readonly"; // // txt_daa010 // this.txt_daa010.Location = new System.Drawing.Point(737, 40); this.txt_daa010.Location = new System.Drawing.Point(726, 40); this.txt_daa010.Name = "txt_daa010"; this.txt_daa010.Properties.Appearance.Options.UseFont = true; this.txt_daa010.Size = new System.Drawing.Size(206, 24); this.txt_daa010.Size = new System.Drawing.Size(200, 24); this.txt_daa010.StyleController = this.layoutMx1; this.txt_daa010.TabIndex = 243; this.txt_daa010.Tag = "readonly"; // // txt_mesEndProd // this.txt_mesEndProd.Location = new System.Drawing.Point(1049, 68); this.txt_mesEndProd.Location = new System.Drawing.Point(1032, 68); this.txt_mesEndProd.Name = "txt_mesEndProd"; this.txt_mesEndProd.Properties.Appearance.Options.UseFont = true; this.txt_mesEndProd.Size = new System.Drawing.Size(206, 24); this.txt_mesEndProd.Size = new System.Drawing.Size(202, 24); this.txt_mesEndProd.StyleController = this.layoutMx1; this.txt_mesEndProd.TabIndex = 338; this.txt_mesEndProd.Tag = "readonly"; // // txt_daa011 // this.txt_daa011.Location = new System.Drawing.Point(737, 68); this.txt_daa011.Location = new System.Drawing.Point(726, 68); this.txt_daa011.Name = "txt_daa011"; this.txt_daa011.Properties.Appearance.Options.UseFont = true; this.txt_daa011.Size = new System.Drawing.Size(206, 24); this.txt_daa011.Size = new System.Drawing.Size(200, 24); this.txt_daa011.StyleController = this.layoutMx1; this.txt_daa011.TabIndex = 247; this.txt_daa011.Tag = "readonly"; // // txt_dptName // this.txt_dptName.Location = new System.Drawing.Point(737, 96); this.txt_dptName.Location = new System.Drawing.Point(726, 96); this.txt_dptName.Name = "txt_dptName"; this.txt_dptName.Properties.Appearance.Options.UseFont = true; this.txt_dptName.Size = new System.Drawing.Size(206, 24); this.txt_dptName.Size = new System.Drawing.Size(200, 24); this.txt_dptName.StyleController = this.layoutMx1; this.txt_dptName.TabIndex = 258; this.txt_dptName.Tag = "readonly"; // // txt_daa016 // this.txt_daa016.Location = new System.Drawing.Point(1049, 96); this.txt_daa016.Location = new System.Drawing.Point(1032, 96); this.txt_daa016.Name = "txt_daa016"; this.txt_daa016.Properties.Appearance.Options.UseFont = true; this.txt_daa016.Size = new System.Drawing.Size(206, 24); this.txt_daa016.Size = new System.Drawing.Size(202, 24); this.txt_daa016.StyleController = this.layoutMx1; this.txt_daa016.TabIndex = 273; this.txt_daa016.Tag = "readonly"; @@ -1201,27 +1161,27 @@ this.txt_daa029.Location = new System.Drawing.Point(114, 96); this.txt_daa029.Name = "txt_daa029"; this.txt_daa029.Properties.Appearance.Options.UseFont = true; this.txt_daa029.Size = new System.Drawing.Size(205, 24); this.txt_daa029.Size = new System.Drawing.Size(200, 24); this.txt_daa029.StyleController = this.layoutMx1; this.txt_daa029.TabIndex = 217; this.txt_daa029.Tag = "readonly"; // // txt_lineName // this.txt_lineName.Location = new System.Drawing.Point(425, 96); this.txt_lineName.Location = new System.Drawing.Point(420, 96); this.txt_lineName.Name = "txt_lineName"; this.txt_lineName.Properties.Appearance.Options.UseFont = true; this.txt_lineName.Size = new System.Drawing.Size(206, 24); this.txt_lineName.Size = new System.Drawing.Size(200, 24); this.txt_lineName.StyleController = this.layoutMx1; this.txt_lineName.TabIndex = 267; this.txt_lineName.Tag = "readonly"; // // txt_daa017 // this.txt_daa017.Location = new System.Drawing.Point(1049, 124); this.txt_daa017.Location = new System.Drawing.Point(1032, 124); this.txt_daa017.Name = "txt_daa017"; this.txt_daa017.Properties.Appearance.Options.UseFont = true; this.txt_daa017.Size = new System.Drawing.Size(206, 24); this.txt_daa017.Size = new System.Drawing.Size(202, 24); this.txt_daa017.StyleController = this.layoutMx1; this.txt_daa017.TabIndex = 280; this.txt_daa017.Tag = "readonly"; @@ -1231,17 +1191,17 @@ this.txt_daa003.Location = new System.Drawing.Point(114, 152); this.txt_daa003.Name = "txt_daa003"; this.txt_daa003.Properties.Appearance.Options.UseFont = true; this.txt_daa003.Size = new System.Drawing.Size(205, 24); this.txt_daa003.Size = new System.Drawing.Size(200, 24); this.txt_daa003.StyleController = this.layoutMx1; this.txt_daa003.TabIndex = 219; this.txt_daa003.Tag = "readonly"; // // txt_dwName // this.txt_dwName.Location = new System.Drawing.Point(1049, 12); this.txt_dwName.Location = new System.Drawing.Point(1032, 12); this.txt_dwName.Name = "txt_dwName"; this.txt_dwName.Properties.Appearance.Options.UseFont = true; this.txt_dwName.Size = new System.Drawing.Size(206, 24); this.txt_dwName.Size = new System.Drawing.Size(202, 24); this.txt_dwName.StyleController = this.layoutMx1; this.txt_dwName.TabIndex = 226; this.txt_dwName.Tag = "readonly"; @@ -1251,16 +1211,16 @@ this.txt_daa004.Location = new System.Drawing.Point(114, 124); this.txt_daa004.Name = "txt_daa004"; this.txt_daa004.Properties.Appearance.Options.UseFont = true; this.txt_daa004.Size = new System.Drawing.Size(205, 24); this.txt_daa004.Size = new System.Drawing.Size(200, 24); this.txt_daa004.StyleController = this.layoutMx1; this.txt_daa004.TabIndex = 222; this.txt_daa004.Tag = "readonly"; // // txt_daa015 // this.txt_daa015.Location = new System.Drawing.Point(425, 124); this.txt_daa015.Location = new System.Drawing.Point(420, 124); this.txt_daa015.Name = "txt_daa015"; this.txt_daa015.Size = new System.Drawing.Size(206, 24); this.txt_daa015.Size = new System.Drawing.Size(200, 24); this.txt_daa015.StyleController = this.layoutMx1; this.txt_daa015.TabIndex = 473; // @@ -1305,39 +1265,39 @@ this.layoutControlItem18}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition1.Width = 100D; columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition2.Width = 100D; columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition3.Width = 100D; columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition4.Width = 100D; columnDefinition16.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition16.Width = 100D; columnDefinition17.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition17.Width = 100D; columnDefinition18.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition18.Width = 100D; columnDefinition19.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition19.Width = 100D; this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { columnDefinition1, columnDefinition2, columnDefinition3, columnDefinition4}); rowDefinition1.Height = 100D; rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition2.Height = 100D; rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition3.Height = 100D; rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition4.Height = 100D; rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition5.Height = 100D; rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition6.Height = 100D; rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition16, columnDefinition17, columnDefinition18, columnDefinition19}); rowDefinition10.Height = 100D; rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition11.Height = 100D; rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition12.Height = 100D; rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition13.Height = 100D; rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition14.Height = 100D; rowDefinition14.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition15.Height = 100D; rowDefinition15.SizeType = System.Windows.Forms.SizeType.Percent; this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { rowDefinition1, rowDefinition2, rowDefinition3, rowDefinition4, rowDefinition5, rowDefinition6}); this.Root.Size = new System.Drawing.Size(1267, 188); rowDefinition10, rowDefinition11, rowDefinition12, rowDefinition13, rowDefinition14, rowDefinition15}); this.Root.Size = new System.Drawing.Size(1246, 188); this.Root.TextVisible = false; // // layoutControlItem1 @@ -1345,17 +1305,17 @@ this.layoutControlItem1.Control = this.txt_daa001; this.layoutControlItem1.Location = new System.Drawing.Point(0, 0); this.layoutControlItem1.Name = "layoutControlItem1"; this.layoutControlItem1.Size = new System.Drawing.Size(311, 28); this.layoutControlItem1.Size = new System.Drawing.Size(306, 28); this.layoutControlItem1.Text = "工单单号"; this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem3 // this.layoutControlItem3.Control = this.txt_daa008; this.layoutControlItem3.Location = new System.Drawing.Point(623, 0); this.layoutControlItem3.Location = new System.Drawing.Point(612, 0); this.layoutControlItem3.Name = "layoutControlItem3"; this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem3.Size = new System.Drawing.Size(312, 28); this.layoutControlItem3.Size = new System.Drawing.Size(306, 28); this.layoutControlItem3.Text = "工单数量"; this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18); // @@ -1365,18 +1325,18 @@ this.layoutControlItem5.Location = new System.Drawing.Point(0, 28); this.layoutControlItem5.Name = "layoutControlItem5"; this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem5.Size = new System.Drawing.Size(311, 28); this.layoutControlItem5.Size = new System.Drawing.Size(306, 28); this.layoutControlItem5.Text = "投料单号"; this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem7 // this.layoutControlItem7.Control = this.txt_daa010; this.layoutControlItem7.Location = new System.Drawing.Point(623, 28); this.layoutControlItem7.Location = new System.Drawing.Point(612, 28); this.layoutControlItem7.Name = "layoutControlItem7"; this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem7.Size = new System.Drawing.Size(312, 28); this.layoutControlItem7.Size = new System.Drawing.Size(306, 28); this.layoutControlItem7.Text = "入库数量"; this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18); // @@ -1386,29 +1346,29 @@ this.layoutControlItem9.Location = new System.Drawing.Point(0, 56); this.layoutControlItem9.Name = "layoutControlItem9"; this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem9.Size = new System.Drawing.Size(311, 28); this.layoutControlItem9.Size = new System.Drawing.Size(306, 28); this.layoutControlItem9.Text = "需求单号"; this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem10 // this.layoutControlItem10.Control = this.txt_daa028; this.layoutControlItem10.Location = new System.Drawing.Point(311, 56); this.layoutControlItem10.Location = new System.Drawing.Point(306, 56); this.layoutControlItem10.Name = "layoutControlItem10"; this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem10.Size = new System.Drawing.Size(312, 28); this.layoutControlItem10.Size = new System.Drawing.Size(306, 28); this.layoutControlItem10.Text = "备料时间"; this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem11 // this.layoutControlItem11.Control = this.txt_daa011; this.layoutControlItem11.Location = new System.Drawing.Point(623, 56); this.layoutControlItem11.Location = new System.Drawing.Point(612, 56); this.layoutControlItem11.Name = "layoutControlItem11"; this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem11.Size = new System.Drawing.Size(312, 28); this.layoutControlItem11.Size = new System.Drawing.Size(306, 28); this.layoutControlItem11.Text = "已生产量"; this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18); // @@ -1418,18 +1378,18 @@ this.layoutControlItem13.Location = new System.Drawing.Point(0, 84); this.layoutControlItem13.Name = "layoutControlItem13"; this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3; this.layoutControlItem13.Size = new System.Drawing.Size(311, 28); this.layoutControlItem13.Size = new System.Drawing.Size(306, 28); this.layoutControlItem13.Text = "产品编码"; this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem14 // this.layoutControlItem14.Control = this.txt_lineName; this.layoutControlItem14.Location = new System.Drawing.Point(311, 84); this.layoutControlItem14.Location = new System.Drawing.Point(306, 84); this.layoutControlItem14.Name = "layoutControlItem14"; this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3; this.layoutControlItem14.Size = new System.Drawing.Size(312, 28); this.layoutControlItem14.Size = new System.Drawing.Size(306, 28); this.layoutControlItem14.Text = "生产线别"; this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18); // @@ -1439,7 +1399,7 @@ this.layoutControlItem17.Location = new System.Drawing.Point(0, 112); this.layoutControlItem17.Name = "layoutControlItem17"; this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4; this.layoutControlItem17.Size = new System.Drawing.Size(311, 28); this.layoutControlItem17.Size = new System.Drawing.Size(306, 28); this.layoutControlItem17.Text = "产品规格"; this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18); // @@ -1449,116 +1409,116 @@ this.layoutControlItem19.Location = new System.Drawing.Point(0, 140); this.layoutControlItem19.Name = "layoutControlItem19"; this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 5; this.layoutControlItem19.Size = new System.Drawing.Size(311, 28); this.layoutControlItem19.Size = new System.Drawing.Size(306, 28); this.layoutControlItem19.Text = "产品名称"; this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem6 // this.layoutControlItem6.Control = this.txt_daa022Remark; this.layoutControlItem6.Location = new System.Drawing.Point(311, 0); this.layoutControlItem6.Location = new System.Drawing.Point(306, 0); this.layoutControlItem6.Name = "layoutControlItem6"; this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem6.Size = new System.Drawing.Size(312, 28); this.layoutControlItem6.Size = new System.Drawing.Size(306, 28); this.layoutControlItem6.Text = "通知备料"; this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem2 // this.layoutControlItem2.Control = this.textEdit1; this.layoutControlItem2.Location = new System.Drawing.Point(311, 28); this.layoutControlItem2.Location = new System.Drawing.Point(306, 28); this.layoutControlItem2.Name = "layoutControlItem2"; this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem2.Size = new System.Drawing.Size(312, 28); this.layoutControlItem2.Size = new System.Drawing.Size(306, 28); this.layoutControlItem2.Text = "备料状态"; this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem15 // this.layoutControlItem15.Control = this.txt_dwName; this.layoutControlItem15.Location = new System.Drawing.Point(935, 0); this.layoutControlItem15.Location = new System.Drawing.Point(918, 0); this.layoutControlItem15.Name = "layoutControlItem15"; this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem15.Size = new System.Drawing.Size(312, 28); this.layoutControlItem15.Size = new System.Drawing.Size(308, 28); this.layoutControlItem15.Text = "单位"; this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem4 // this.layoutControlItem4.Control = this.txt_mesStartProd; this.layoutControlItem4.Location = new System.Drawing.Point(935, 28); this.layoutControlItem4.Location = new System.Drawing.Point(918, 28); this.layoutControlItem4.Name = "layoutControlItem4"; this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem4.Size = new System.Drawing.Size(312, 28); this.layoutControlItem4.Size = new System.Drawing.Size(308, 28); this.layoutControlItem4.Text = "预计开工时间"; this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem8 // this.layoutControlItem8.Control = this.txt_mesEndProd; this.layoutControlItem8.Location = new System.Drawing.Point(935, 56); this.layoutControlItem8.Location = new System.Drawing.Point(918, 56); this.layoutControlItem8.Name = "layoutControlItem8"; this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem8.Size = new System.Drawing.Size(312, 28); this.layoutControlItem8.Size = new System.Drawing.Size(308, 28); this.layoutControlItem8.Text = "预计完工时间"; this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem12 // this.layoutControlItem12.Control = this.txt_daa016; this.layoutControlItem12.Location = new System.Drawing.Point(935, 84); this.layoutControlItem12.Location = new System.Drawing.Point(918, 84); this.layoutControlItem12.Name = "layoutControlItem12"; this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3; this.layoutControlItem12.Size = new System.Drawing.Size(312, 28); this.layoutControlItem12.Size = new System.Drawing.Size(308, 28); this.layoutControlItem12.Text = "实际开工时间"; this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem16 // this.layoutControlItem16.Control = this.txt_daa017; this.layoutControlItem16.Location = new System.Drawing.Point(935, 112); this.layoutControlItem16.Location = new System.Drawing.Point(918, 112); this.layoutControlItem16.Name = "layoutControlItem16"; this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 4; this.layoutControlItem16.Size = new System.Drawing.Size(312, 28); this.layoutControlItem16.Size = new System.Drawing.Size(308, 28); this.layoutControlItem16.Text = "实际完工时间"; this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem28 // this.layoutControlItem28.Control = this.txt_daa009; this.layoutControlItem28.Location = new System.Drawing.Point(311, 140); this.layoutControlItem28.Location = new System.Drawing.Point(306, 140); this.layoutControlItem28.Name = "layoutControlItem28"; this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem28.OptionsTableLayoutItem.ColumnSpan = 2; this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 5; this.layoutControlItem28.Size = new System.Drawing.Size(624, 28); this.layoutControlItem28.Size = new System.Drawing.Size(612, 28); this.layoutControlItem28.Text = "工单备注"; this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem27 // this.layoutControlItem27.Control = this.txt_daa015; this.layoutControlItem27.Location = new System.Drawing.Point(311, 112); this.layoutControlItem27.Location = new System.Drawing.Point(306, 112); this.layoutControlItem27.Name = "layoutControlItem27"; this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 4; this.layoutControlItem27.Size = new System.Drawing.Size(312, 28); this.layoutControlItem27.Size = new System.Drawing.Size(306, 28); this.layoutControlItem27.Text = "生产线别ID"; this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem20 // this.layoutControlItem20.Control = this.txt_dptName; this.layoutControlItem20.Location = new System.Drawing.Point(623, 84); this.layoutControlItem20.Location = new System.Drawing.Point(612, 84); this.layoutControlItem20.Name = "layoutControlItem20"; this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 3; this.layoutControlItem20.Size = new System.Drawing.Size(312, 28); this.layoutControlItem20.Size = new System.Drawing.Size(306, 28); this.layoutControlItem20.Text = "车间名称"; this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18); // @@ -1566,11 +1526,11 @@ // this.layoutControlItem18.Control = this.txt_daa013; this.layoutControlItem18.CustomizationFormText = "生产车间ID"; this.layoutControlItem18.Location = new System.Drawing.Point(623, 112); this.layoutControlItem18.Location = new System.Drawing.Point(612, 112); this.layoutControlItem18.Name = "layoutControlItem18"; this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4; this.layoutControlItem18.Size = new System.Drawing.Size(312, 28); this.layoutControlItem18.Size = new System.Drawing.Size(306, 28); this.layoutControlItem18.Text = "车间ID"; this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18); // @@ -2179,10 +2139,10 @@ // repositoryItemButtonEdit1 // this.repositoryItemButtonEdit1.AutoHeight = false; editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1"; this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick); @@ -2317,29 +2277,29 @@ this.layoutControlItem24}); this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.layoutControlGroup1.Name = "Root"; columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition5.Width = 100D; columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition6.Width = 100D; columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition7.Width = 100D; columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition8.Width = 100D; columnDefinition9.SizeType = System.Windows.Forms.SizeType.AutoSize; columnDefinition9.Width = 125D; columnDefinition20.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition20.Width = 100D; columnDefinition21.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition21.Width = 100D; columnDefinition22.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition22.Width = 100D; columnDefinition23.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition23.Width = 100D; columnDefinition24.SizeType = System.Windows.Forms.SizeType.AutoSize; columnDefinition24.Width = 125D; this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { columnDefinition5, columnDefinition6, columnDefinition7, columnDefinition8, columnDefinition9}); rowDefinition7.Height = 100D; rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition8.Height = 100D; rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition20, columnDefinition21, columnDefinition22, columnDefinition23, columnDefinition24}); rowDefinition16.Height = 100D; rowDefinition16.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition17.Height = 100D; rowDefinition17.SizeType = System.Windows.Forms.SizeType.Percent; this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { rowDefinition7, rowDefinition8}); rowDefinition16, rowDefinition17}); this.layoutControlGroup1.Size = new System.Drawing.Size(1265, 82); this.layoutControlGroup1.TextVisible = false; // @@ -2668,29 +2628,29 @@ this.layoutControlItem37}); this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.layoutControlGroup2.Name = "Root"; columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition10.Width = 100D; columnDefinition11.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition11.Width = 100D; columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition12.Width = 100D; columnDefinition13.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition13.Width = 100D; columnDefinition14.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition14.Width = 100D; columnDefinition15.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition15.Width = 100D; columnDefinition25.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition25.Width = 100D; columnDefinition26.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition26.Width = 100D; columnDefinition27.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition27.Width = 100D; columnDefinition28.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition28.Width = 100D; columnDefinition29.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition29.Width = 100D; columnDefinition30.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition30.Width = 100D; this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { columnDefinition10, columnDefinition11, columnDefinition12, columnDefinition13, columnDefinition14, columnDefinition15}); rowDefinition9.Height = 100D; rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition25, columnDefinition26, columnDefinition27, columnDefinition28, columnDefinition29, columnDefinition30}); rowDefinition18.Height = 100D; rowDefinition18.SizeType = System.Windows.Forms.SizeType.Percent; this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { rowDefinition9}); rowDefinition18}); this.layoutControlGroup2.Size = new System.Drawing.Size(1265, 54); this.layoutControlGroup2.TextVisible = false; // @@ -3041,10 +3001,7 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn5; private DevExpress.XtraGrid.Columns.GridColumn gv_daa027; private DevExpress.XtraGrid.Columns.GridColumn gridColumn7; private DevExpress.XtraGrid.Columns.GridColumn gridColumn8; private DevExpress.XtraGrid.Columns.GridColumn gridColumn9; private DevExpress.XtraGrid.Columns.GridColumn gridColumn10; private DevExpress.XtraGrid.Columns.GridColumn gridColumn11; private DevExpress.XtraGrid.Columns.GridColumn gridColumn12; private DevExpress.XtraGrid.Columns.GridColumn gridColumn6; private DevExpress.XtraGrid.Columns.GridColumn gv_daa018; DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -509,7 +509,7 @@ strMsg = "工单暂停"; break; case 3: strMsg = "撤回完工"; strMsg = "清尾"; break; case 4: strMsg = "紧急备料"; DevApp/Gs.DevApp/DevFrm/WOM/showZhongTai.Designer.cs
@@ -53,9 +53,9 @@ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); this.comZt.Properties.Items.AddRange(new object[] { "-请选择-", "1,待开工", "2,工单暂停", "3,撤回完工", "1,D:待开工", "2,S:暂停", "3,Q:清尾", "4,紧急备料", "5,暂停备料", "6,撤回备料"}); @@ -65,7 +65,6 @@ // // btnCancel // this.btnCancel.Appearance.Options.UseFont = true; this.btnCancel.ButtonStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat; this.btnCancel.Cursor = System.Windows.Forms.Cursors.Hand; @@ -79,7 +78,6 @@ // // btnSave // this.btnSave.Appearance.Options.UseFont = true; this.btnSave.ButtonStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat; this.btnSave.Cursor = System.Windows.Forms.Cursors.Hand; DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -320,12 +320,6 @@ <Compile Include="DevFrm\FQC\Frm_FqcDetect01.Designer.cs"> <DependentUpon>Frm_FqcDetect01.cs</DependentUpon> </Compile> <Compile Include="DevFrm\FQC\Frm_FqcDetect01Check.cs"> <SubType>Form</SubType> </Compile> <Compile Include="DevFrm\FQC\Frm_FqcDetect01Check.Designer.cs"> <DependentUpon>Frm_FqcDetect01Check.cs</DependentUpon> </Compile> <Compile Include="DevFrm\FQC\MesFqcExceptional.cs"> <SubType>Form</SubType> </Compile> @@ -1263,9 +1257,6 @@ </EmbeddedResource> <EmbeddedResource Include="DevFrm\FQC\Frm_FqcDetect01.resx"> <DependentUpon>Frm_FqcDetect01.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="DevFrm\FQC\Frm_FqcDetect01Check.resx"> <DependentUpon>Frm_FqcDetect01Check.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="DevFrm\FQC\MesFqcExceptional.resx"> <DependentUpon>MesFqcExceptional.cs</DependentUpon> DevApp/Gs.DevApp/Gs.DevApp.csproj.user
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <ProjectView>ProjectFiles</ProjectView> <ProjectView>ShowAllFiles</ProjectView> <PublishUrlHistory>publish\</PublishUrlHistory> <InstallUrlHistory /> <SupportUrlHistory /> DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -2077,12 +2077,21 @@ } #endregion /// <summary> /// 判断是不是一个有效的数值 /// </summary> /// <param name="str"></param> /// <returns></returns> public static bool IsNumeric(string str) { Regex regex = new Regex("^[0-9]+$"); return regex.IsMatch(str); } /// <summary> /// 判断是不是一个有效果的decimal数值 /// </summary> /// <param name="str"></param> /// <returns></returns> public static bool IsNumeric2(string str) { string input = str;
