DevApp/Gs.DevApp/App.config
@@ -28,8 +28,8 @@ </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" /> DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.Designer.cs
@@ -28,20 +28,20 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition10 = 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 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.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(); this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu(); this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage(); @@ -254,6 +254,7 @@ // split1 // this.split1.Dock = System.Windows.Forms.DockStyle.Fill; this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2; this.split1.Horizontal = false; this.split1.Location = new System.Drawing.Point(0, 0); this.split1.Name = "split1"; @@ -266,7 +267,8 @@ // // split1.Panel2 // this.split1.Panel2.Text = "Panel2";this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; this.split1.Panel2.Text = "Panel2"; this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; this.split1.Size = new System.Drawing.Size(1126, 570); this.split1.SplitterPosition = 0; this.split1.TabIndex = 0; @@ -636,7 +638,7 @@ this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill; this.splitMx1.Horizontal = false; this.splitMx1.Location = new System.Drawing.Point(0, 0); this.splitMx1.Name = "splitMx1";this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; this.splitMx1.Name = "splitMx1"; // // splitMx1.Panel1 // @@ -647,6 +649,7 @@ // this.splitMx1.Panel2.Controls.Add(this.tabMx); this.splitMx1.Panel2.Text = "Panel2"; this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; this.splitMx1.Size = new System.Drawing.Size(1126, 570); this.splitMx1.SplitterPosition = 187; this.splitMx1.TabIndex = 0; @@ -902,35 +905,35 @@ this.layoutControlItem4}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.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; 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; this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { columnDefinition5, columnDefinition6, columnDefinition7, columnDefinition8}); rowDefinition6.Height = 100D; rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition7.Height = 100D; rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition8.Height = 100D; rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition9.Height = 100D; rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition10.Height = 100D; rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent; 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; this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { rowDefinition6, rowDefinition7, rowDefinition8, rowDefinition9, rowDefinition10}); rowDefinition1, rowDefinition2, rowDefinition3, rowDefinition4, rowDefinition5}); this.Root.Size = new System.Drawing.Size(1126, 187); this.Root.TextVisible = false; // @@ -1487,16 +1490,16 @@ this.gvMxDel.MinWidth = 25; this.gvMxDel.Name = "gvMxDel"; this.gvMxDel.Visible = true; this.gvMxDel.VisibleIndex = 9; this.gvMxDel.VisibleIndex = 10; this.gvMxDel.Width = 94; // // repositoryItemButtonEdit1 // this.repositoryItemButtonEdit1.AutoHeight = false; editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; editorButtonImageOptions1.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, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); 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)}); this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1"; this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick); @@ -1516,7 +1519,7 @@ this.gridColumn13.MinWidth = 25; this.gridColumn13.Name = "gridColumn13"; this.gridColumn13.Visible = true; this.gridColumn13.VisibleIndex = 10; this.gridColumn13.VisibleIndex = 9; this.gridColumn13.Width = 94; // // picCheckBox DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.Designer.cs
@@ -173,7 +173,7 @@ // // tlcActions // this.tlcActions.Caption = "字典类型"; this.tlcActions.Caption = "字典分组"; this.tlcActions.FieldName = "sType"; this.tlcActions.MinWidth = 23; this.tlcActions.Name = "tlcActions"; DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.cs
@@ -111,7 +111,6 @@ frm.ShowDialog(); }; } private void TlMenu_MouseDown(object sender, MouseEventArgs e) { if (e.Button == MouseButtons.Right) @@ -185,7 +184,6 @@ { MsgHelper.Warning("提示：" + ex.Message); } } } DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs
@@ -99,7 +99,7 @@ this.gvMx1fcheckItem = new DevExpress.XtraGrid.Columns.GridColumn(); this.rptJYXM = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox(); this.gvMx1forder = new DevExpress.XtraGrid.Columns.GridColumn(); this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox(); this.rptShunXui = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox(); this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1memo = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1fcheckTool = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -117,6 +117,8 @@ this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn(); this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn(); this.rptStation = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox(); this.picCheckBox = new System.Windows.Forms.PictureBox(); this.tips = new DevExpress.Utils.ToolTipController(this.components); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); @@ -165,12 +167,13 @@ ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.rptJYXM)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.rptShunXui)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.rptJYGJ)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.rptJYBZ)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.rptJYSP)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.rptJSSP)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.rptStation)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit(); this.SuspendLayout(); // @@ -826,7 +829,8 @@ this.rptJSSP, this.rptJYSP, this.repositoryItemButtonEdit1, this.repositoryItemComboBox1}); this.rptShunXui, this.rptStation}); this.gcMx1.Size = new System.Drawing.Size(1125, 419); this.gcMx1.TabIndex = 0; this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { @@ -850,7 +854,8 @@ this.gvMx1fstand, this.gvMx1fdownAllow, this.gridColumn19, this.gvMxDel}); this.gvMxDel, this.gridColumn6}); this.gvMx1.GridControl = this.gcMx1; this.gvMx1.Name = "gvMx1"; this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True; @@ -861,7 +866,7 @@ // gvMx1guid // this.gvMx1guid.AppearanceCell.Options.UseFont = true; this.gvMx1guid.Caption = "guid"; this.gvMx1guid.Caption = "子表主键GUID"; this.gvMx1guid.FieldName = "guid"; this.gvMx1guid.Name = "gvMx1guid"; this.gvMx1guid.Tag = "query_a.guid"; @@ -870,7 +875,7 @@ // gvMx1pid // this.gvMx1pid.AppearanceCell.Options.UseFont = true; this.gvMx1pid.Caption = "pid"; this.gvMx1pid.Caption = "主表主键GUID"; this.gvMx1pid.FieldName = "pid"; this.gvMx1pid.Name = "gvMx1pid"; this.gvMx1pid.Tag = "query_a.pid"; @@ -899,7 +904,7 @@ // this.gvMx1forder.AppearanceCell.Options.UseFont = true; this.gvMx1forder.Caption = "顺序"; this.gvMx1forder.ColumnEdit = this.repositoryItemComboBox1; this.gvMx1forder.ColumnEdit = this.rptShunXui; this.gvMx1forder.FieldName = "forder"; this.gvMx1forder.Name = "gvMx1forder"; this.gvMx1forder.Tag = "yz_quantity_0_edit"; @@ -907,12 +912,12 @@ this.gvMx1forder.VisibleIndex = 1; this.gvMx1forder.Width = 50; // // repositoryItemComboBox1 // rptShunXui // this.repositoryItemComboBox1.AutoHeight = false; this.repositoryItemComboBox1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { this.rptShunXui.AutoHeight = false; this.rptShunXui.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); this.repositoryItemComboBox1.Items.AddRange(new object[] { this.rptShunXui.Items.AddRange(new object[] { "1", "2", "3", @@ -928,7 +933,7 @@ "13", "14", "15"}); this.repositoryItemComboBox1.Name = "repositoryItemComboBox1"; this.rptShunXui.Name = "rptShunXui"; // // gridColumn5 // @@ -1093,7 +1098,7 @@ this.gvMxDel.MinWidth = 50; this.gvMxDel.Name = "gvMxDel"; this.gvMxDel.Visible = true; this.gvMxDel.VisibleIndex = 13; this.gvMxDel.VisibleIndex = 14; this.gvMxDel.Width = 100; // // repositoryItemButtonEdit1 @@ -1106,6 +1111,26 @@ this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1"; this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick); // // gridColumn6 // this.gridColumn6.Caption = "工位"; this.gridColumn6.ColumnEdit = this.rptStation; this.gridColumn6.FieldName = "stationName"; this.gridColumn6.MinWidth = 25; this.gridColumn6.Name = "gridColumn6"; this.gridColumn6.Tag = "edit"; this.gridColumn6.Visible = true; this.gridColumn6.VisibleIndex = 13; this.gridColumn6.Width = 94; // // rptStation // this.rptStation.AutoHeight = false; this.rptStation.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); this.rptStation.Name = "rptStation"; this.rptStation.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; // // picCheckBox // @@ -1173,12 +1198,13 @@ ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.rptJYXM)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.rptShunXui)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.rptJYGJ)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.rptJYBZ)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.rptJYSP)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.rptJSSP)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.rptStation)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit(); this.ResumeLayout(false); @@ -1227,7 +1253,7 @@ private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid; private DevExpress.XtraGrid.Columns.GridColumn gvMx1pid; private DevExpress.XtraGrid.Columns.GridColumn gvMx1forder; private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox1; private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptShunXui; private DevExpress.XtraGrid.Columns.GridColumn gvMx1fcheckItem; private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJYXM; private DevExpress.XtraGrid.Columns.GridColumn gridColumn5; @@ -1262,5 +1288,7 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5; private DevExpress.XtraGrid.Columns.GridColumn gridColumn6; private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptStation; } } DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
@@ -43,12 +43,16 @@ txt_ftype.Text = strType; if (strType == "iqc") dfValue = 5; this.gvMx1.InitNewRow += (s, e) => if (strType != "ipqc巡检") { this.gvMx1.SetRowCellValue(e.RowHandle, "ypsl", dfValue); int newIndex = gvMx1.DataRowCount + 1; this.gvMx1.SetRowCellValue(e.RowHandle, "forder", newIndex); }; gvMx1.Columns["stationName"].Visible = false; } this.gvMx1.InitNewRow += (s, e) => { this.gvMx1.SetRowCellValue(e.RowHandle, "ypsl", dfValue); int newIndex = gvMx1.DataRowCount + 1; this.gvMx1.SetRowCellValue(e.RowHandle, "forder", newIndex); }; this.toolBarMenu1.getXmlConfig(); Form parentForm = this.FindForm(); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1); @@ -73,7 +77,7 @@ Gs.DevApp.ToolBox.MsgHelper.ShowInformation("请先保存当前信息！"); return; } if ((txt_foneChecked.Checked==false)) if ((txt_foneChecked.Checked == false)) { Gs.DevApp.ToolBox.MsgHelper.ShowInformation("该项目未审核，暂不能复制到其它物料！"); return; @@ -344,6 +348,7 @@ FupAllow = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(row["FupAllow"].ToString()), FdownAllow = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(row["FdownAllow"].ToString()), ypsl = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(row["ypsl"].ToString()), stationName = row["stationName"].ToString(), }); } } @@ -586,6 +591,7 @@ _getListJybz(); _getListJssp(); _getListJysp(); _getListStation(); } /// <summary> /// 读取检验项目 @@ -608,7 +614,34 @@ MsgHelper.Warning("提示：" + ex.Message); } } /// <summary> /// 读取检验工位 /// </summary> private void _getListStation() { string _where = " and 1=1 and s_type='工位信息' and pid<>'00000000-0000-0000-0000-000000000000'"; var pgq = new PageQueryModel(1, 999999, "a.defect_name", "asc", "", _where); var json = JsonConvert.SerializeObject(pgq); try { var strReturn = UtilityHelper.HttpPost("", "MesDefectCodeManager/GetListPage", json); var dd = UtilityHelper.ReturnToTablePage(strReturn); var dt = dd.rtnData.list; foreach (DataRow dr in dt.Rows) { //tlMenu.KeyFieldName = "guid"; //tlMenu.ParentFieldName = "pid"; rptStation.Items.Add(dr["defectName"].ToString()); } } catch (Exception ex) { MsgHelper.Warning("提示：" + ex.Message); } } /// <summary> /// 读取检验工具 /// </summary> @@ -663,8 +696,8 @@ { rptJSSP.Items.AddRange(new string[] { "0.010---(AQL_0_0010)" , "0.015---(AQL_0_0015)" , "0.025---(AQL_0_0025)" ,"0.015---(AQL_0_0015)" ,"0.025---(AQL_0_0025)" ,"0.040---(AQL_0_0040)" ,"0.065---(AQL_0_0065)" ,"0.10---(AQL_0_010)" DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitemDt.cs
@@ -216,10 +216,12 @@ public long? ItemId { get; set; } /// <summary> /// /// 工位 ///</summary> public string stationName { get; set; } /// <summary> /// 样品数量 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
@@ -289,7 +289,7 @@ this.split1.Panel1.Controls.Add(this.gcMain1); this.split1.Panel1.Controls.Add(this.pageBar1); this.split1.Panel1.Text = "Panel1"; this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.False; this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; this.split1.Size = new System.Drawing.Size(1167, 570); this.split1.SplitterPosition = 0; this.split1.TabIndex = 4; DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
@@ -490,6 +490,7 @@ gcMx1.DataSource = dt; gcMx1.ForceInitialize(); gvMx1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1); } else { @@ -507,6 +508,7 @@ gcMx2.DataSource = dt2; gcMx2.ForceInitialize(); gvMx2.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx2); } else { DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.cs
@@ -218,6 +218,7 @@ gcMx1.DataSource = dt; gcMx1.ForceInitialize(); gvMx1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1); } else { @@ -235,6 +236,7 @@ gcMx2.DataSource = dt2; gcMx2.ForceInitialize(); gvMx2.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx2); } else { DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs
@@ -339,6 +339,7 @@ // split1 // this.split1.Dock = System.Windows.Forms.DockStyle.Fill; this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2; this.split1.Horizontal = false; this.split1.Location = new System.Drawing.Point(0, 0); this.split1.Name = "split1"; @@ -351,7 +352,8 @@ // // split1.Panel2 // this.split1.Panel2.Text = "Panel2";this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; this.split1.Panel2.Text = "Panel2"; this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; this.split1.Size = new System.Drawing.Size(1126, 570); this.split1.SplitterPosition = 0; this.split1.TabIndex = 0; @@ -630,7 +632,7 @@ // // gridColumn44 // this.gridColumn44.Caption = "申请组织Id"; this.gridColumn44.Caption = "申请组织ID"; this.gridColumn44.FieldName = "fapporgid"; this.gridColumn44.MinWidth = 25; this.gridColumn44.Name = "gridColumn44"; @@ -698,7 +700,7 @@ // // gv_id // this.gv_id.Caption = "主键Guid"; this.gv_id.Caption = "主键GUID"; this.gv_id.FieldName = "id"; this.gv_id.MinWidth = 25; this.gv_id.Name = "gv_id"; @@ -728,7 +730,7 @@ this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill; this.splitMx1.Horizontal = false; this.splitMx1.Location = new System.Drawing.Point(0, 0); this.splitMx1.Name = "splitMx1";this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; this.splitMx1.Name = "splitMx1"; // // splitMx1.Panel1 // @@ -739,6 +741,7 @@ // this.splitMx1.Panel2.Controls.Add(this.tabMx); this.splitMx1.Panel2.Text = "Panel2"; this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; this.splitMx1.Size = new System.Drawing.Size(1126, 570); this.splitMx1.SplitterPosition = 169; this.splitMx1.TabIndex = 0; DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbckDj.Designer.cs
@@ -540,8 +540,6 @@ this.gridColumn16.FieldName = "guid"; this.gridColumn16.MinWidth = 25; this.gridColumn16.Name = "gridColumn16"; this.gridColumn16.Visible = true; this.gridColumn16.VisibleIndex = 17; this.gridColumn16.Width = 94; // // pageBar1 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuiDj.Designer.cs
@@ -219,6 +219,7 @@ // split1 // this.split1.Dock = System.Windows.Forms.DockStyle.Fill; this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2; this.split1.Horizontal = false; this.split1.Location = new System.Drawing.Point(0, 0); this.split1.Name = "split1"; @@ -231,7 +232,8 @@ // // split1.Panel2 // this.split1.Panel2.Text = "Panel2";this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; this.split1.Panel2.Text = "Panel2"; this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; this.split1.Size = new System.Drawing.Size(1126, 570); this.split1.SplitterPosition = 0; this.split1.TabIndex = 0; @@ -500,7 +502,7 @@ this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill; this.splitMx1.Horizontal = false; this.splitMx1.Location = new System.Drawing.Point(0, 0); this.splitMx1.Name = "splitMx1";this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; this.splitMx1.Name = "splitMx1"; // // splitMx1.Panel1 // @@ -511,6 +513,7 @@ // this.splitMx1.Panel2.Controls.Add(this.tabMx); this.splitMx1.Panel2.Text = "Panel2"; this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; this.splitMx1.Size = new System.Drawing.Size(1126, 570); this.splitMx1.SplitterPosition = 144; this.splitMx1.TabIndex = 0; @@ -743,7 +746,7 @@ this.layoutControlItem3.Name = "layoutControlItem3"; this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem3.Size = new System.Drawing.Size(276, 31); this.layoutControlItem3.Text = "创建人"; this.layoutControlItem3.Text = "创建人员"; this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem4 @@ -753,7 +756,7 @@ this.layoutControlItem4.Name = "layoutControlItem4"; this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem4.Size = new System.Drawing.Size(278, 31); this.layoutControlItem4.Text = "审核人"; this.layoutControlItem4.Text = "审核人员"; this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem5 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.Designer.cs
@@ -265,6 +265,7 @@ // split1 // this.split1.Dock = System.Windows.Forms.DockStyle.Fill; this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2; this.split1.Horizontal = false; this.split1.Location = new System.Drawing.Point(0, 0); this.split1.Name = "split1"; @@ -274,8 +275,9 @@ this.split1.Panel1.Controls.Add(this.gcMain1); this.split1.Panel1.Controls.Add(this.pageBar1); this.split1.Panel1.Text = "Panel1"; this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; this.split1.Size = new System.Drawing.Size(1167, 570); this.split1.SplitterPosition = 558; this.split1.SplitterPosition = 0; this.split1.TabIndex = 4; // // gcMain1
