| DevApp/Gs.DevApp/App.config | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/FrmMain.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/Rpt/Ckcgmx.Designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/Rpt/Ckcgmx.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.Designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechniqueShow.Designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechniqueShow.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
DevApp/Gs.DevApp/App.config
@@ -29,8 +29,8 @@ </runtime> <appSettings> <!--<add key="WebApiUrl" value="http://localhost:5263/" />--> <add key="WebApiUrl" value="http://192.168.1.145:8081/" /> <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />--> <!--<add key="WebApiUrl" value="http://192.168.1.145:8081/" />--> <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/FrmMain.cs
@@ -25,7 +25,7 @@ /// tab临时选项卡 /// </summary> private static readonly Dictionary<string, XtraTabPage> TabPageDic = new Dictionary<string, XtraTabPage>(); private string OldorgFids = ""; public FrmMain() { InitializeComponent(); DevApp/Gs.DevApp/DevFrm/Rpt/Ckcgmx.Designer.cs
@@ -33,24 +33,37 @@ this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage(); this.split1 = new DevExpress.XtraEditors.SplitContainerControl(); this.gcMain1 = new DevExpress.XtraGrid.GridControl(); this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_itemId = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_quantity = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_depotId = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_depotSectionsCode = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_ownerType = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_ownerId = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_indepUserCode = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_indepDate = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridView1 = new DevExpress.XtraGrid.Views.BandedGrid.AdvBandedGridView(); this.gv_guid = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); this.gv_itemBarcode = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); this.gv_itemId = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); this.gridColumn3 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); this.gridColumn2 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); this.gridColumn4 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); this.gv_depotId = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); this.gv_quantity = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); this.gridColumn6 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); this.gridColumn1 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); this.bandedGridColumn1 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); this.gv_ownerType = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); this.gridColumn5 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); this.gv_ownerId = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); this.pageBar1 = new UserControls.Data.UcPageBar(); this.gridBand1 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); this.gridBand4 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); this.gridBand7 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); this.gridBand8 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); this.gridBand9 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); this.gridBand10 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); this.gridBand11 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); this.gridBand12 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); this.gridBand13 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); this.gridBand14 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); this.gridBand15 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); this.gridBand3 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); this.gridBand2 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); this.gridBand6 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); this.gridBand5 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -74,7 +87,7 @@ this.toolBarMenu1.Location = new System.Drawing.Point(0, 0); this.toolBarMenu1.Name = "toolBarMenu1"; this.toolBarMenu1.rptParameter = null; this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80); this.toolBarMenu1.Size = new System.Drawing.Size(1312, 80); this.toolBarMenu1.TabIndex = 0; this.toolBarMenu1.xlsInService = null; this.toolBarMenu1.xlsOutParameter = null; @@ -85,7 +98,7 @@ this.xtraTabControl1.Location = new System.Drawing.Point(0, 80); this.xtraTabControl1.Name = "xtraTabControl1"; this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1; this.xtraTabControl1.Size = new System.Drawing.Size(1128, 602); this.xtraTabControl1.Size = new System.Drawing.Size(1312, 602); this.xtraTabControl1.TabIndex = 3; this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.xtraTabPage1}); @@ -94,7 +107,7 @@ // this.xtraTabPage1.Controls.Add(this.split1); this.xtraTabPage1.Name = "xtraTabPage1"; this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570); this.xtraTabPage1.Size = new System.Drawing.Size(1310, 570); this.xtraTabPage1.Text = "数据列表"; // // split1 @@ -115,7 +128,7 @@ // this.split1.Panel2.Text = "Panel2"; this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; this.split1.Size = new System.Drawing.Size(1126, 570); this.split1.Size = new System.Drawing.Size(1310, 570); this.split1.SplitterPosition = 0; this.split1.TabIndex = 0; // @@ -125,7 +138,7 @@ this.gcMain1.Location = new System.Drawing.Point(0, 0); this.gcMain1.MainView = this.gridView1; this.gcMain1.Name = "gcMain1"; this.gcMain1.Size = new System.Drawing.Size(1126, 519); this.gcMain1.Size = new System.Drawing.Size(1310, 519); this.gcMain1.TabIndex = 2; this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gridView1}); @@ -133,28 +146,40 @@ // gridView1 // this.gridView1.Appearance.Row.Options.UseFont = true; this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { this.gridView1.Bands.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] { this.gridBand1, this.gridBand4, this.gridBand7, this.gridBand8, this.gridBand9, this.gridBand10, this.gridBand11, this.gridBand12, this.gridBand13, this.gridBand14, this.gridBand15, this.gridBand3}); this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn[] { this.gv_guid, this.gv_itemBarcode, this.gv_itemId, this.gridColumn3, this.gridColumn2, this.gridColumn4, this.gv_quantity, this.gv_depotId, this.gv_quantity, this.gridColumn6, this.gridColumn1, this.gv_depotSectionsCode, this.gv_ownerType, this.gv_ownerId, this.gridColumn5, this.gv_indepUserCode, this.gv_indepDate}); this.bandedGridColumn1}); 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.ShowColumnHeaders = false; this.gridView1.OptionsView.ShowFooter = true; this.gridView1.OptionsView.ShowGroupPanel = false; // @@ -167,50 +192,8 @@ this.gv_guid.Name = "gv_guid"; this.gv_guid.OptionsColumn.AllowEdit = false; this.gv_guid.Tag = "query_a.guid"; this.gv_guid.Width = 94; // // gv_itemId // this.gv_itemId.AppearanceCell.Options.UseFont = true; this.gv_itemId.Caption = "物料ID "; this.gv_itemId.FieldName = "itemId"; this.gv_itemId.MinWidth = 50; this.gv_itemId.Name = "gv_itemId"; this.gv_itemId.OptionsColumn.AllowEdit = false; this.gv_itemId.Tag = "query_a.ITEM_ID"; this.gv_itemId.Visible = true; this.gv_itemId.VisibleIndex = 0; this.gv_itemId.Width = 73; // // gridColumn3 // this.gridColumn3.Caption = "物料编码"; this.gridColumn3.FieldName = "itemNo"; this.gridColumn3.MinWidth = 25; this.gridColumn3.Name = "gridColumn3"; this.gridColumn3.Visible = true; this.gridColumn3.VisibleIndex = 2; this.gridColumn3.Width = 73; // // gridColumn2 // this.gridColumn2.Caption = "物料名称"; this.gridColumn2.FieldName = "itemName"; this.gridColumn2.MinWidth = 25; this.gridColumn2.Name = "gridColumn2"; this.gridColumn2.Visible = true; this.gridColumn2.VisibleIndex = 3; this.gridColumn2.Width = 73; // // gridColumn4 // this.gridColumn4.Caption = "规格型号"; this.gridColumn4.FieldName = "itemModel"; this.gridColumn4.MinWidth = 25; this.gridColumn4.Name = "gridColumn4"; this.gridColumn4.Visible = true; this.gridColumn4.VisibleIndex = 4; this.gridColumn4.Width = 73; this.gv_guid.Visible = true; this.gv_guid.Width = 95; // // gv_itemBarcode // @@ -222,131 +205,145 @@ this.gv_itemBarcode.OptionsColumn.AllowEdit = false; this.gv_itemBarcode.Tag = "query_a.ITEM_BARCODE"; this.gv_itemBarcode.Visible = true; this.gv_itemBarcode.VisibleIndex = 1; this.gv_itemBarcode.Width = 73; this.gv_itemBarcode.Width = 77; // // gv_quantity // gv_itemId // this.gv_quantity.AppearanceCell.Options.UseFont = true; this.gv_quantity.Caption = "采购单数量 "; this.gv_quantity.FieldName = "cgsl"; this.gv_quantity.MinWidth = 50; this.gv_quantity.Name = "gv_quantity"; this.gv_quantity.OptionsColumn.AllowEdit = false; this.gv_quantity.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] { new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "quantity", "合计={0:0.##}")}); this.gv_quantity.Tag = "query_a.QUANTITY"; this.gv_quantity.Visible = true; this.gv_quantity.VisibleIndex = 5; this.gv_quantity.Width = 73; this.gv_itemId.AppearanceCell.Options.UseFont = true; this.gv_itemId.Caption = "物料ID"; this.gv_itemId.FieldName = "itemId"; this.gv_itemId.MinWidth = 50; this.gv_itemId.Name = "gv_itemId"; this.gv_itemId.OptionsColumn.AllowEdit = false; this.gv_itemId.Tag = "query_a.ITEM_ID"; this.gv_itemId.Visible = true; this.gv_itemId.Width = 74; // // gridColumn3 // this.gridColumn3.Caption = "物料编码"; this.gridColumn3.FieldName = "itemNo"; this.gridColumn3.MinWidth = 25; this.gridColumn3.Name = "gridColumn3"; this.gridColumn3.Visible = true; this.gridColumn3.Width = 77; // // gridColumn2 // this.gridColumn2.Caption = "物料名称"; this.gridColumn2.FieldName = "itemName"; this.gridColumn2.MinWidth = 25; this.gridColumn2.Name = "gridColumn2"; this.gridColumn2.Visible = true; this.gridColumn2.Width = 77; // // gridColumn4 // this.gridColumn4.Caption = "规格型号"; this.gridColumn4.FieldName = "itemModel"; this.gridColumn4.MinWidth = 25; this.gridColumn4.Name = "gridColumn4"; this.gridColumn4.Visible = true; this.gridColumn4.Width = 77; // // gv_depotId // this.gv_depotId.AppearanceCell.Options.UseFont = true; this.gv_depotId.Caption = "仓库ID"; this.gv_depotId.FieldName = "depotId"; this.gv_depotId.Caption = "采购单位"; this.gv_depotId.FieldName = "dwCg"; this.gv_depotId.MinWidth = 50; this.gv_depotId.Name = "gv_depotId"; this.gv_depotId.OptionsColumn.AllowEdit = false; this.gv_depotId.Tag = "query_a.DEPOT_ID"; this.gv_depotId.Visible = true; this.gv_depotId.VisibleIndex = 6; this.gv_depotId.Width = 73; this.gv_depotId.Width = 77; // // gv_quantity // this.gv_quantity.AppearanceCell.ForeColor = System.Drawing.Color.Blue; this.gv_quantity.AppearanceCell.Options.UseFont = true; this.gv_quantity.AppearanceCell.Options.UseForeColor = true; this.gv_quantity.Caption = "采购单数量"; this.gv_quantity.FieldName = "cgsl"; this.gv_quantity.MinWidth = 50; this.gv_quantity.Name = "gv_quantity"; this.gv_quantity.OptionsColumn.AllowEdit = false; this.gv_quantity.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] { new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "cgsl", "合计={0:0.##}")}); this.gv_quantity.Tag = "query_a.QUANTITY"; this.gv_quantity.Visible = true; this.gv_quantity.Width = 60; // // gridColumn6 // this.gridColumn6.Caption = "仓库编号"; this.gridColumn6.FieldName = "depotNo"; this.gridColumn6.AppearanceCell.ForeColor = System.Drawing.Color.Blue; this.gridColumn6.AppearanceCell.Options.UseForeColor = true; this.gridColumn6.Caption = "累计实入库"; this.gridColumn6.FieldName = "qtySjrk"; this.gridColumn6.MinWidth = 25; this.gridColumn6.Name = "gridColumn6"; this.gridColumn6.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] { new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "qtySjrk", "合计={0:0.##}")}); this.gridColumn6.Visible = true; this.gridColumn6.VisibleIndex = 7; this.gridColumn6.Width = 73; this.gridColumn6.Width = 60; // // gridColumn1 // this.gridColumn1.Caption = "仓库名称"; this.gridColumn1.FieldName = "depotName"; this.gridColumn1.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 9F, System.Drawing.FontStyle.Bold); this.gridColumn1.AppearanceCell.ForeColor = System.Drawing.Color.Red; this.gridColumn1.AppearanceCell.Options.UseFont = true; this.gridColumn1.AppearanceCell.Options.UseForeColor = true; this.gridColumn1.Caption = "总欠料"; this.gridColumn1.FieldName = "qtyQl"; this.gridColumn1.MinWidth = 25; this.gridColumn1.Name = "gridColumn1"; this.gridColumn1.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] { new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "qtyQl", "合计={0:0.##}")}); this.gridColumn1.Visible = true; this.gridColumn1.VisibleIndex = 8; this.gridColumn1.Width = 73; this.gridColumn1.Width = 60; // // gv_depotSectionsCode // bandedGridColumn1 // this.gv_depotSectionsCode.AppearanceCell.Options.UseFont = true; this.gv_depotSectionsCode.Caption = "货位编号"; this.gv_depotSectionsCode.FieldName = "depotSectionsCode"; this.gv_depotSectionsCode.MinWidth = 50; this.gv_depotSectionsCode.Name = "gv_depotSectionsCode"; this.gv_depotSectionsCode.OptionsColumn.AllowEdit = false; this.gv_depotSectionsCode.Tag = "query_a.DEPOT_SECTIONS_CODE"; this.gv_depotSectionsCode.Visible = true; this.gv_depotSectionsCode.VisibleIndex = 9; this.gv_depotSectionsCode.Width = 73; this.bandedGridColumn1.Caption = "比例"; this.bandedGridColumn1.FieldName = "barbl"; this.bandedGridColumn1.MinWidth = 25; this.bandedGridColumn1.Name = "bandedGridColumn1"; this.bandedGridColumn1.Tag = "query_a.guid"; this.bandedGridColumn1.Visible = true; this.bandedGridColumn1.Width = 327; // // gv_ownerType // this.gv_ownerType.AppearanceCell.Options.UseFont = true; this.gv_ownerType.Caption = "货主类型"; this.gv_ownerType.FieldName = "ownerType"; this.gv_ownerType.Caption = "累计收料数量"; this.gv_ownerType.FieldName = "sl"; this.gv_ownerType.MinWidth = 50; this.gv_ownerType.Name = "gv_ownerType"; this.gv_ownerType.OptionsColumn.AllowEdit = false; this.gv_ownerType.Tag = "query_a.Owner_Type"; this.gv_ownerType.Visible = true; this.gv_ownerType.VisibleIndex = 10; this.gv_ownerType.Width = 73; this.gv_ownerType.Width = 105; // // gridColumn5 // this.gridColumn5.Caption = "累计仓退"; this.gridColumn5.FieldName = "ct"; this.gridColumn5.MinWidth = 25; this.gridColumn5.Name = "gridColumn5"; this.gridColumn5.Visible = true; this.gridColumn5.Width = 105; // // gv_ownerId // this.gv_ownerId.AppearanceCell.Options.UseFont = true; this.gv_ownerId.Caption = "货主ID"; this.gv_ownerId.FieldName = "ownerId"; this.gv_ownerId.Caption = "累计验退"; this.gv_ownerId.FieldName = "yt"; this.gv_ownerId.MinWidth = 50; this.gv_ownerId.Name = "gv_ownerId"; this.gv_ownerId.OptionsColumn.AllowEdit = false; this.gv_ownerId.Tag = "query_a.Owner_Id"; this.gv_ownerId.Visible = true; this.gv_ownerId.VisibleIndex = 11; this.gv_ownerId.Width = 73; // // gridColumn5 // this.gridColumn5.Caption = "货主名称"; this.gridColumn5.FieldName = "ownerName"; this.gridColumn5.MinWidth = 25; this.gridColumn5.Name = "gridColumn5"; this.gridColumn5.Visible = true; this.gridColumn5.VisibleIndex = 12; this.gridColumn5.Width = 73; // // gv_indepUserCode // this.gv_indepUserCode.AppearanceCell.Options.UseFont = true; this.gv_indepUserCode.Caption = "入库人"; this.gv_indepUserCode.FieldName = "indepUserCode"; this.gv_indepUserCode.MinWidth = 50; this.gv_indepUserCode.Name = "gv_indepUserCode"; this.gv_indepUserCode.OptionsColumn.AllowEdit = false; this.gv_indepUserCode.Tag = "query_a.INDEP_USER_CODE"; this.gv_indepUserCode.Visible = true; this.gv_indepUserCode.VisibleIndex = 13; this.gv_indepUserCode.Width = 73; // // gv_indepDate // this.gv_indepDate.AppearanceCell.Options.UseFont = true; this.gv_indepDate.Caption = "入库日期 "; this.gv_indepDate.FieldName = "indepDate"; this.gv_indepDate.MinWidth = 10; this.gv_indepDate.Name = "gv_indepDate"; this.gv_indepDate.OptionsColumn.AllowEdit = false; this.gv_indepDate.Tag = "query_a.INDEP_DATE"; this.gv_indepDate.Visible = true; this.gv_indepDate.VisibleIndex = 14; this.gv_indepDate.Width = 10; this.gv_ownerId.Width = 130; // // pageBar1 // @@ -356,15 +353,173 @@ this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5); this.pageBar1.Name = "pageBar1"; this.pageBar1.RecordCount = 0; this.pageBar1.Size = new System.Drawing.Size(1126, 39); this.pageBar1.Size = new System.Drawing.Size(1310, 39); this.pageBar1.TabIndex = 4; this.pageBar1.TotalPages = 0; // // gridBand1 // this.gridBand1.AppearanceHeader.Options.UseTextOptions = true; this.gridBand1.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; this.gridBand1.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap; this.gridBand1.Caption = "采购明细GUID"; this.gridBand1.Columns.Add(this.gv_guid); this.gridBand1.Name = "gridBand1"; this.gridBand1.Visible = false; this.gridBand1.VisibleIndex = -1; this.gridBand1.Width = 95; // // gridBand4 // this.gridBand4.AppearanceHeader.Options.UseTextOptions = true; this.gridBand4.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; this.gridBand4.Caption = "采购单号"; this.gridBand4.Columns.Add(this.gv_itemBarcode); this.gridBand4.Name = "gridBand4"; this.gridBand4.VisibleIndex = 0; this.gridBand4.Width = 77; // // gridBand7 // this.gridBand7.Caption = "物料ID"; this.gridBand7.Columns.Add(this.gv_itemId); this.gridBand7.Name = "gridBand7"; this.gridBand7.Visible = false; this.gridBand7.VisibleIndex = -1; this.gridBand7.Width = 74; // // gridBand8 // this.gridBand8.Caption = "物料编码"; this.gridBand8.Columns.Add(this.gridColumn3); this.gridBand8.Name = "gridBand8"; this.gridBand8.VisibleIndex = 1; this.gridBand8.Width = 77; // // gridBand9 // this.gridBand9.Caption = "物料名称"; this.gridBand9.Columns.Add(this.gridColumn2); this.gridBand9.Name = "gridBand9"; this.gridBand9.VisibleIndex = 2; this.gridBand9.Width = 77; // // gridBand10 // this.gridBand10.Caption = "规格型号"; this.gridBand10.Columns.Add(this.gridColumn4); this.gridBand10.Name = "gridBand10"; this.gridBand10.VisibleIndex = 3; this.gridBand10.Width = 77; // // gridBand11 // this.gridBand11.AppearanceHeader.Options.UseTextOptions = true; this.gridBand11.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap; this.gridBand11.Caption = "采购单位"; this.gridBand11.Columns.Add(this.gv_depotId); this.gridBand11.MinWidth = 30; this.gridBand11.Name = "gridBand11"; this.gridBand11.VisibleIndex = 4; this.gridBand11.Width = 77; // // gridBand12 // this.gridBand12.AppearanceHeader.ForeColor = System.Drawing.Color.Blue; this.gridBand12.AppearanceHeader.Options.UseForeColor = true; this.gridBand12.AppearanceHeader.Options.UseTextOptions = true; this.gridBand12.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap; this.gridBand12.Caption = "采购单数量"; this.gridBand12.Columns.Add(this.gv_quantity); this.gridBand12.MinWidth = 50; this.gridBand12.Name = "gridBand12"; this.gridBand12.VisibleIndex = 5; this.gridBand12.Width = 60; // // gridBand13 // this.gridBand13.AppearanceHeader.ForeColor = System.Drawing.Color.Blue; this.gridBand13.AppearanceHeader.Options.UseForeColor = true; this.gridBand13.AppearanceHeader.Options.UseTextOptions = true; this.gridBand13.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap; this.gridBand13.Caption = "累计实入库"; this.gridBand13.Columns.Add(this.gridColumn6); this.gridBand13.MinWidth = 50; this.gridBand13.Name = "gridBand13"; this.gridBand13.VisibleIndex = 6; this.gridBand13.Width = 60; // // gridBand14 // this.gridBand14.AppearanceHeader.ForeColor = System.Drawing.Color.Red; this.gridBand14.AppearanceHeader.Options.UseForeColor = true; this.gridBand14.AppearanceHeader.Options.UseTextOptions = true; this.gridBand14.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap; this.gridBand14.Caption = "总欠料"; this.gridBand14.Columns.Add(this.gridColumn1); this.gridBand14.MinWidth = 50; this.gridBand14.Name = "gridBand14"; this.gridBand14.VisibleIndex = 7; this.gridBand14.Width = 60; // // gridBand15 // this.gridBand15.Caption = "交货进度"; this.gridBand15.Columns.Add(this.bandedGridColumn1); this.gridBand15.MinWidth = 300; this.gridBand15.Name = "gridBand15"; this.gridBand15.VisibleIndex = 8; this.gridBand15.Width = 327; // // gridBand3 // this.gridBand3.AppearanceHeader.Options.UseTextOptions = true; this.gridBand3.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; this.gridBand3.Caption = "汇总"; this.gridBand3.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] { this.gridBand2, this.gridBand6, this.gridBand5}); this.gridBand3.MinWidth = 300; this.gridBand3.Name = "gridBand3"; this.gridBand3.VisibleIndex = 9; this.gridBand3.Width = 340; // // gridBand2 // this.gridBand2.AppearanceHeader.Options.UseTextOptions = true; this.gridBand2.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap; this.gridBand2.Caption = "累计收料"; this.gridBand2.Columns.Add(this.gv_ownerType); this.gridBand2.Name = "gridBand2"; this.gridBand2.VisibleIndex = 0; this.gridBand2.Width = 105; // // gridBand6 // this.gridBand6.AppearanceHeader.Options.UseTextOptions = true; this.gridBand6.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap; this.gridBand6.Caption = "累计退料"; this.gridBand6.Columns.Add(this.gridColumn5); this.gridBand6.Name = "gridBand6"; this.gridBand6.VisibleIndex = 1; this.gridBand6.Width = 105; // // gridBand5 // this.gridBand5.AppearanceHeader.Options.UseTextOptions = true; this.gridBand5.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap; this.gridBand5.Caption = "累计验退"; this.gridBand5.Columns.Add(this.gv_ownerId); this.gridBand5.Name = "gridBand5"; this.gridBand5.VisibleIndex = 2; this.gridBand5.Width = 130; // // Ckcgmx // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(1128, 682); this.ClientSize = new System.Drawing.Size(1312, 682); this.Controls.Add(this.xtraTabControl1); this.Controls.Add(this.toolBarMenu1); this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black; @@ -389,23 +544,36 @@ private DevExpress.XtraTab.XtraTabPage xtraTabPage1; private DevExpress.XtraEditors.SplitContainerControl split1; private DevExpress.XtraGrid.GridControl gcMain1; private DevExpress.XtraGrid.Views.Grid.GridView gridView1; private DevExpress.XtraGrid.Columns.GridColumn gv_guid; private DevExpress.XtraGrid.Columns.GridColumn gv_itemId; private DevExpress.XtraGrid.Columns.GridColumn gridColumn3; private DevExpress.XtraGrid.Columns.GridColumn gridColumn2; private DevExpress.XtraGrid.Columns.GridColumn gridColumn4; private DevExpress.XtraGrid.Columns.GridColumn gv_itemBarcode; private DevExpress.XtraGrid.Columns.GridColumn gv_quantity; private DevExpress.XtraGrid.Columns.GridColumn gv_depotId; private DevExpress.XtraGrid.Columns.GridColumn gridColumn6; private DevExpress.XtraGrid.Columns.GridColumn gridColumn1; private DevExpress.XtraGrid.Columns.GridColumn gv_depotSectionsCode; private DevExpress.XtraGrid.Columns.GridColumn gv_ownerType; private DevExpress.XtraGrid.Columns.GridColumn gv_ownerId; private DevExpress.XtraGrid.Columns.GridColumn gridColumn5; private DevExpress.XtraGrid.Columns.GridColumn gv_indepUserCode; private DevExpress.XtraGrid.Columns.GridColumn gv_indepDate; private UserControls.Data.UcPageBar pageBar1; private DevExpress.XtraGrid.Views.BandedGrid.AdvBandedGridView gridView1; private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_guid; private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_itemBarcode; private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_itemId; private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gridColumn3; private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gridColumn2; private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gridColumn4; private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_depotId; private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_quantity; private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gridColumn6; private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gridColumn1; private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_ownerType; private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_ownerId; private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gridColumn5; private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn1; private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand1; private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand4; private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand7; private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand8; private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand9; private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand10; private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand11; private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand12; private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand13; private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand14; private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand15; private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand3; private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand2; private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand6; private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand5; } } DevApp/Gs.DevApp/DevFrm/Rpt/Ckcgmx.cs
@@ -1,4 +1,5 @@ using DevExpress.XtraEditors; using DevExpress.Utils; using DevExpress.XtraEditors; using Gs.DevApp.Entity; using Gs.DevApp.ToolBox; using Gs.DevApp.UserControl; @@ -25,6 +26,9 @@ this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick; this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick; this.toolBarMenu1.getXmlConfig(); gridView1.Columns["barbl"].DisplayFormat.FormatType = FormatType.Numeric; gridView1.Columns["barbl"].DisplayFormat.FormatString = "p0"; Gs.DevApp.ToolBox.UtilityHelper.CustomProgressBarColumn(gridView1, "barbl", 90, Brushes.OrangeRed, Brushes.DodgerBlue); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, this, "", "", (value) => { @@ -37,6 +41,9 @@ }); getPageList(1); pageBar1.PagerEvent += PageBar1_PagerEvent; } private async void GridView1_ColumnFilterChanged(object sender, EventArgs e) { DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.Designer.cs
@@ -61,6 +61,7 @@ this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn37 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn38 = new DevExpress.XtraGrid.Columns.GridColumn(); this.repositoryItemMemoEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit(); this.repositoryItemMemoEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit(); this.pageBar1 = new UserControls.Data.UcPageBar(); @@ -68,13 +69,13 @@ this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl(); this.splitTop1 = new DevExpress.XtraEditors.SplitContainerControl(); this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl(); this.txt_badReson = new Gs.DevApp.UserControl.UcDictionary(); this.txt_repairReson = new Gs.DevApp.UserControl.UcDictionary(); this.txt_badDescription = new Gs.DevApp.UserControl.UcDictionary(); this.txt_repairMethd = new Gs.DevApp.UserControl.UcDictionary(); this.lbGuid = new System.Windows.Forms.Label(); this.txt_gdbh = new DevExpress.XtraEditors.TextEdit(); this.txt_gx = new DevExpress.XtraEditors.TextEdit(); this.txt_collectBy = new DevExpress.XtraEditors.TextEdit(); this.txt_processNo = new DevExpress.XtraEditors.TextEdit(); this.txt_createBy = new DevExpress.XtraEditors.TextEdit(); this.txt_barCode = new DevExpress.XtraEditors.TextEdit(); this.txt_itemNo = new DevExpress.XtraEditors.TextEdit(); this.txt_itemName = new DevExpress.XtraEditors.TextEdit(); @@ -115,24 +116,6 @@ this.btnGood = new DevExpress.XtraEditors.SimpleButton(); this.btnBad = new DevExpress.XtraEditors.SimpleButton(); this.tabMx = new DevExpress.XtraTab.XtraTabControl(); this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); this.gcMx1 = new DevExpress.XtraGrid.GridControl(); this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx2status = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx2pbillNo = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx2itemNo = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn(); this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage(); this.gcMx2 = new DevExpress.XtraGrid.GridControl(); this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView(); @@ -143,7 +126,6 @@ this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn27 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn28 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -151,6 +133,23 @@ this.gridColumn34 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn35 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn36 = new DevExpress.XtraGrid.Columns.GridColumn(); this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); this.gcMx1 = new DevExpress.XtraGrid.GridControl(); this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx2status = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx2pbillNo = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx2itemNo = 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.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn(); this.tips = new DevExpress.Utils.ToolTipController(this.components); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); @@ -180,8 +179,8 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit(); this.layoutMx1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.txt_gdbh.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_gx.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_collectBy.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_processNo.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_barCode.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit(); @@ -210,12 +209,12 @@ this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit(); this.tabMx.SuspendLayout(); this.tabMxPage1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit(); this.tabMxPage2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit(); this.tabMxPage1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit(); this.SuspendLayout(); // // toolBarMenu1 @@ -305,7 +304,8 @@ this.gridColumn20, this.gridColumn21, this.gridColumn23, this.gridColumn37}); this.gridColumn37, this.gridColumn38}); this.gridView1.GridControl = this.gcMain1; this.gridView1.Name = "gridView1"; this.gridView1.OptionsFind.ShowSearchNavButtons = false; @@ -442,6 +442,14 @@ this.gridColumn37.VisibleIndex = 9; this.gridColumn37.Width = 94; // // gridColumn38 // this.gridColumn38.Caption = "主键Guid"; this.gridColumn38.FieldName = "guid"; this.gridColumn38.MinWidth = 25; this.gridColumn38.Name = "gridColumn38"; this.gridColumn38.Width = 94; // // repositoryItemMemoEdit1 // this.repositoryItemMemoEdit1.Name = "repositoryItemMemoEdit1"; @@ -523,13 +531,13 @@ // // layoutMx1 // this.layoutMx1.Controls.Add(this.txt_badReson); this.layoutMx1.Controls.Add(this.txt_repairReson); this.layoutMx1.Controls.Add(this.txt_badDescription); this.layoutMx1.Controls.Add(this.txt_repairMethd); this.layoutMx1.Controls.Add(this.lbGuid); this.layoutMx1.Controls.Add(this.txt_gdbh); this.layoutMx1.Controls.Add(this.txt_gx); this.layoutMx1.Controls.Add(this.txt_collectBy); this.layoutMx1.Controls.Add(this.txt_processNo); this.layoutMx1.Controls.Add(this.txt_createBy); this.layoutMx1.Controls.Add(this.txt_barCode); this.layoutMx1.Controls.Add(this.txt_itemNo); this.layoutMx1.Controls.Add(this.txt_itemName); @@ -548,15 +556,15 @@ this.layoutMx1.TabIndex = 0; this.layoutMx1.Text = "layoutControl1"; // // txt_badReson // txt_repairReson // this.txt_badReson.BtnTxt = "不良原因"; this.txt_badReson.Location = new System.Drawing.Point(12, 157); this.txt_badReson.Name = "txt_badReson"; this.txt_badReson.Size = new System.Drawing.Size(410, 57); this.txt_badReson.TabIndex = 26; this.txt_badReson.TextTxt = ""; this.txt_badReson.WhereTxt = " a.s_type=\'工序不良原因\' and a.pid<>\'00000000-0000-0000-0000-000000000000\'"; this.txt_repairReson.BtnTxt = "不良原因"; this.txt_repairReson.Location = new System.Drawing.Point(12, 157); this.txt_repairReson.Name = "txt_repairReson"; this.txt_repairReson.Size = new System.Drawing.Size(410, 57); this.txt_repairReson.TabIndex = 26; this.txt_repairReson.TextTxt = ""; this.txt_repairReson.WhereTxt = " a.s_type=\'工序不良原因\' and a.pid<>\'00000000-0000-0000-0000-000000000000\'"; // // txt_badDescription // @@ -595,23 +603,23 @@ this.txt_gdbh.StyleController = this.layoutMx1; this.txt_gdbh.TabIndex = 4; // // txt_gx // txt_processNo // this.txt_gx.Location = new System.Drawing.Point(498, 70); this.txt_gx.Name = "txt_gx"; this.txt_gx.Properties.ReadOnly = true; this.txt_gx.Size = new System.Drawing.Size(131, 24); this.txt_gx.StyleController = this.layoutMx1; this.txt_gx.TabIndex = 5; this.txt_processNo.Location = new System.Drawing.Point(498, 70); this.txt_processNo.Name = "txt_processNo"; this.txt_processNo.Properties.ReadOnly = true; this.txt_processNo.Size = new System.Drawing.Size(131, 24); this.txt_processNo.StyleController = this.layoutMx1; this.txt_processNo.TabIndex = 5; // // txt_collectBy // txt_createBy // this.txt_collectBy.Location = new System.Drawing.Point(705, 70); this.txt_collectBy.Name = "txt_collectBy"; this.txt_collectBy.Properties.ReadOnly = true; this.txt_collectBy.Size = new System.Drawing.Size(132, 24); this.txt_collectBy.StyleController = this.layoutMx1; this.txt_collectBy.TabIndex = 6; this.txt_createBy.Location = new System.Drawing.Point(705, 70); this.txt_createBy.Name = "txt_createBy"; this.txt_createBy.Properties.ReadOnly = true; this.txt_createBy.Size = new System.Drawing.Size(132, 24); this.txt_createBy.StyleController = this.layoutMx1; this.txt_createBy.TabIndex = 6; // // txt_barCode // @@ -826,7 +834,7 @@ // // layoutControlItem9 // this.layoutControlItem9.Control = this.txt_badReson; this.layoutControlItem9.Control = this.txt_repairReson; this.layoutControlItem9.Location = new System.Drawing.Point(0, 145); this.layoutControlItem9.Name = "layoutControlItem9"; this.layoutControlItem9.OptionsTableLayoutItem.ColumnSpan = 2; @@ -839,7 +847,7 @@ // // layoutControlItem2 // this.layoutControlItem2.Control = this.txt_gx; this.layoutControlItem2.Control = this.txt_processNo; this.layoutControlItem2.Location = new System.Drawing.Point(414, 58); this.layoutControlItem2.Name = "layoutControlItem2"; this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2; @@ -880,7 +888,7 @@ // // layoutControlItem3 // this.layoutControlItem3.Control = this.txt_collectBy; this.layoutControlItem3.Control = this.txt_createBy; this.layoutControlItem3.Location = new System.Drawing.Point(621, 58); this.layoutControlItem3.Name = "layoutControlItem3"; this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 3; @@ -1056,211 +1064,12 @@ this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill; this.tabMx.Location = new System.Drawing.Point(0, 0); this.tabMx.Name = "tabMx"; this.tabMx.SelectedTabPage = this.tabMxPage1; this.tabMx.SelectedTabPage = this.tabMxPage2; this.tabMx.Size = new System.Drawing.Size(1251, 332); this.tabMx.TabIndex = 4; this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabMxPage1, this.tabMxPage2}); // // tabMxPage1 // this.tabMxPage1.Controls.Add(this.gcMx1); this.tabMxPage1.Name = "tabMxPage1"; this.tabMxPage1.Size = new System.Drawing.Size(1249, 300); this.tabMxPage1.Text = "已修理明细"; // // gcMx1 // this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill; this.gcMx1.Location = new System.Drawing.Point(0, 0); this.gcMx1.MainView = this.gvMx1; this.gcMx1.Name = "gcMx1"; this.gcMx1.Size = new System.Drawing.Size(1249, 300); this.gcMx1.TabIndex = 0; this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx1}); // // gvMx1 // this.gvMx1.Appearance.Row.Options.UseFont = true; this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { this.gridColumn12, this.gridColumn24, this.gvMx2status, this.gvMx2pbillNo, this.gvMx2itemNo, this.gridColumn5, this.gridColumn6, this.gridColumn3, this.gridColumn7, this.gridColumn2, this.gridColumn26, this.gridColumn15, this.gridColumn4, this.gridColumn14, this.gridColumn25}); this.gvMx1.GridControl = this.gcMx1; this.gvMx1.Name = "gvMx1"; this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False; this.gvMx1.OptionsFind.ShowSearchNavButtons = false; this.gvMx1.OptionsView.ShowGroupPanel = false; // // gridColumn12 // this.gridColumn12.Caption = "guid"; this.gridColumn12.FieldName = "guid"; this.gridColumn12.MinWidth = 25; this.gridColumn12.Name = "gridColumn12"; this.gridColumn12.OptionsColumn.ReadOnly = true; this.gridColumn12.Width = 94; // // gridColumn24 // this.gridColumn24.Caption = "产线"; this.gridColumn24.FieldName = "lineName"; this.gridColumn24.MinWidth = 25; this.gridColumn24.Name = "gridColumn24"; this.gridColumn24.Visible = true; this.gridColumn24.VisibleIndex = 0; this.gridColumn24.Width = 94; // // gvMx2status // this.gvMx2status.AppearanceCell.Options.UseFont = true; this.gvMx2status.Caption = "工单编号"; this.gvMx2status.FieldName = "gdbh"; this.gvMx2status.MinWidth = 10; this.gvMx2status.Name = "gvMx2status"; this.gvMx2status.OptionsColumn.ReadOnly = true; this.gvMx2status.Tag = "query_a.status"; this.gvMx2status.Visible = true; this.gvMx2status.VisibleIndex = 1; this.gvMx2status.Width = 71; // // gvMx2pbillNo // this.gvMx2pbillNo.AppearanceCell.Options.UseFont = true; this.gvMx2pbillNo.Caption = "追溯码"; this.gvMx2pbillNo.FieldName = "barCode"; this.gvMx2pbillNo.Name = "gvMx2pbillNo"; this.gvMx2pbillNo.OptionsColumn.ReadOnly = true; this.gvMx2pbillNo.Tag = "query_a.pbill_no"; this.gvMx2pbillNo.Visible = true; this.gvMx2pbillNo.VisibleIndex = 2; this.gvMx2pbillNo.Width = 91; // // gvMx2itemNo // this.gvMx2itemNo.AppearanceCell.Options.UseFont = true; this.gvMx2itemNo.Caption = "物料编码"; this.gvMx2itemNo.FieldName = "itemNo"; this.gvMx2itemNo.Name = "gvMx2itemNo"; this.gvMx2itemNo.OptionsColumn.ReadOnly = true; this.gvMx2itemNo.Tag = "query_a.item_no"; this.gvMx2itemNo.Visible = true; this.gvMx2itemNo.VisibleIndex = 3; this.gvMx2itemNo.Width = 91; // // gridColumn5 // this.gridColumn5.Caption = "物料名称"; this.gridColumn5.FieldName = "itemName"; this.gridColumn5.Name = "gridColumn5"; this.gridColumn5.OptionsColumn.ReadOnly = true; this.gridColumn5.Visible = true; this.gridColumn5.VisibleIndex = 4; this.gridColumn5.Width = 91; // // gridColumn6 // this.gridColumn6.Caption = "规格型号"; this.gridColumn6.FieldName = "itemModel"; this.gridColumn6.Name = "gridColumn6"; this.gridColumn6.OptionsColumn.ReadOnly = true; this.gridColumn6.Visible = true; this.gridColumn6.VisibleIndex = 5; this.gridColumn6.Width = 91; // // gridColumn3 // this.gridColumn3.Caption = "数量"; this.gridColumn3.FieldName = "quantity"; this.gridColumn3.MinWidth = 25; this.gridColumn3.Name = "gridColumn3"; this.gridColumn3.Visible = true; this.gridColumn3.VisibleIndex = 6; this.gridColumn3.Width = 91; // // gridColumn7 // this.gridColumn7.Caption = "修理状态"; this.gridColumn7.FieldName = "repairResult"; this.gridColumn7.MinWidth = 25; this.gridColumn7.Name = "gridColumn7"; this.gridColumn7.Visible = true; this.gridColumn7.VisibleIndex = 7; this.gridColumn7.Width = 91; // // gridColumn2 // this.gridColumn2.Caption = "送修工序"; this.gridColumn2.FieldName = "processNo"; this.gridColumn2.MinWidth = 25; this.gridColumn2.Name = "gridColumn2"; this.gridColumn2.Visible = true; this.gridColumn2.VisibleIndex = 8; this.gridColumn2.Width = 91; // // gridColumn26 // this.gridColumn26.Caption = "送修员"; this.gridColumn26.FieldName = "collectByName"; this.gridColumn26.MinWidth = 25; this.gridColumn26.Name = "gridColumn26"; this.gridColumn26.Visible = true; this.gridColumn26.VisibleIndex = 9; this.gridColumn26.Width = 94; // // gridColumn15 // this.gridColumn15.Caption = "送修时间"; this.gridColumn15.FieldName = "createDate"; this.gridColumn15.MinWidth = 25; this.gridColumn15.Name = "gridColumn15"; this.gridColumn15.Visible = true; this.gridColumn15.VisibleIndex = 10; this.gridColumn15.Width = 113; // // gridColumn4 // this.gridColumn4.Caption = "不良描述"; this.gridColumn4.FieldName = "badDescription"; this.gridColumn4.MinWidth = 25; this.gridColumn4.Name = "gridColumn4"; this.gridColumn4.Visible = true; this.gridColumn4.VisibleIndex = 11; this.gridColumn4.Width = 91; // // gridColumn14 // this.gridColumn14.Caption = "不良原因"; this.gridColumn14.FieldName = "badReson"; this.gridColumn14.MinWidth = 25; this.gridColumn14.Name = "gridColumn14"; this.gridColumn14.Visible = true; this.gridColumn14.VisibleIndex = 12; this.gridColumn14.Width = 94; // // gridColumn25 // this.gridColumn25.Caption = "不良对策"; this.gridColumn25.FieldName = "repairMethd"; this.gridColumn25.MinWidth = 25; this.gridColumn25.Name = "gridColumn25"; this.gridColumn25.Visible = true; this.gridColumn25.VisibleIndex = 13; this.gridColumn25.Width = 94; // // tabMxPage2 // @@ -1291,7 +1100,6 @@ this.gridColumn17, this.gridColumn27, this.gridColumn28, this.gridColumn29, this.gridColumn30, this.gridColumn31, this.gridColumn32, @@ -1381,24 +1189,18 @@ this.gridColumn28.VisibleIndex = 5; this.gridColumn28.Width = 91; // // gridColumn29 // this.gridColumn29.Caption = "数量"; this.gridColumn29.FieldName = "quantity"; this.gridColumn29.MinWidth = 25; this.gridColumn29.Name = "gridColumn29"; this.gridColumn29.Visible = true; this.gridColumn29.VisibleIndex = 6; this.gridColumn29.Width = 91; // // gridColumn30 // this.gridColumn30.AppearanceCell.ForeColor = System.Drawing.Color.Blue; this.gridColumn30.AppearanceCell.Options.UseForeColor = true; this.gridColumn30.AppearanceHeader.ForeColor = System.Drawing.Color.Blue; this.gridColumn30.AppearanceHeader.Options.UseForeColor = true; this.gridColumn30.Caption = "修理状态"; this.gridColumn30.FieldName = "repairResult"; this.gridColumn30.MinWidth = 25; this.gridColumn30.Name = "gridColumn30"; this.gridColumn30.Visible = true; this.gridColumn30.VisibleIndex = 7; this.gridColumn30.VisibleIndex = 6; this.gridColumn30.Width = 91; // // gridColumn31 @@ -1408,7 +1210,7 @@ this.gridColumn31.MinWidth = 25; this.gridColumn31.Name = "gridColumn31"; this.gridColumn31.Visible = true; this.gridColumn31.VisibleIndex = 8; this.gridColumn31.VisibleIndex = 7; this.gridColumn31.Width = 91; // // gridColumn32 @@ -1418,7 +1220,7 @@ this.gridColumn32.MinWidth = 25; this.gridColumn32.Name = "gridColumn32"; this.gridColumn32.Visible = true; this.gridColumn32.VisibleIndex = 9; this.gridColumn32.VisibleIndex = 8; this.gridColumn32.Width = 94; // // gridColumn33 @@ -1428,7 +1230,7 @@ this.gridColumn33.MinWidth = 25; this.gridColumn33.Name = "gridColumn33"; this.gridColumn33.Visible = true; this.gridColumn33.VisibleIndex = 10; this.gridColumn33.VisibleIndex = 9; this.gridColumn33.Width = 113; // // gridColumn34 @@ -1438,7 +1240,7 @@ this.gridColumn34.MinWidth = 25; this.gridColumn34.Name = "gridColumn34"; this.gridColumn34.Visible = true; this.gridColumn34.VisibleIndex = 11; this.gridColumn34.VisibleIndex = 10; this.gridColumn34.Width = 91; // // gridColumn35 @@ -1448,7 +1250,7 @@ this.gridColumn35.MinWidth = 25; this.gridColumn35.Name = "gridColumn35"; this.gridColumn35.Visible = true; this.gridColumn35.VisibleIndex = 12; this.gridColumn35.VisibleIndex = 11; this.gridColumn35.Width = 94; // // gridColumn36 @@ -1458,8 +1260,200 @@ this.gridColumn36.MinWidth = 25; this.gridColumn36.Name = "gridColumn36"; this.gridColumn36.Visible = true; this.gridColumn36.VisibleIndex = 13; this.gridColumn36.VisibleIndex = 12; this.gridColumn36.Width = 94; // // tabMxPage1 // this.tabMxPage1.Controls.Add(this.gcMx1); this.tabMxPage1.Name = "tabMxPage1"; this.tabMxPage1.Size = new System.Drawing.Size(1249, 300); this.tabMxPage1.Text = "已修理明细"; // // gcMx1 // this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill; this.gcMx1.Location = new System.Drawing.Point(0, 0); this.gcMx1.MainView = this.gvMx1; this.gcMx1.Name = "gcMx1"; this.gcMx1.Size = new System.Drawing.Size(1249, 300); this.gcMx1.TabIndex = 0; this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx1}); // // gvMx1 // this.gvMx1.Appearance.Row.Options.UseFont = true; this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { this.gridColumn12, this.gridColumn24, this.gvMx2status, this.gvMx2pbillNo, this.gvMx2itemNo, this.gridColumn5, this.gridColumn6, this.gridColumn7, this.gridColumn2, this.gridColumn26, this.gridColumn15, this.gridColumn4, this.gridColumn14, this.gridColumn25}); this.gvMx1.GridControl = this.gcMx1; this.gvMx1.Name = "gvMx1"; this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False; this.gvMx1.OptionsFind.ShowSearchNavButtons = false; this.gvMx1.OptionsView.ShowGroupPanel = false; // // gridColumn12 // this.gridColumn12.Caption = "guid"; this.gridColumn12.FieldName = "guid"; this.gridColumn12.MinWidth = 25; this.gridColumn12.Name = "gridColumn12"; this.gridColumn12.OptionsColumn.ReadOnly = true; this.gridColumn12.Width = 94; // // gridColumn24 // this.gridColumn24.Caption = "产线"; this.gridColumn24.FieldName = "lineName"; this.gridColumn24.MinWidth = 25; this.gridColumn24.Name = "gridColumn24"; this.gridColumn24.Visible = true; this.gridColumn24.VisibleIndex = 0; this.gridColumn24.Width = 94; // // gvMx2status // this.gvMx2status.AppearanceCell.Options.UseFont = true; this.gvMx2status.Caption = "工单编号"; this.gvMx2status.FieldName = "gdbh"; this.gvMx2status.MinWidth = 10; this.gvMx2status.Name = "gvMx2status"; this.gvMx2status.OptionsColumn.ReadOnly = true; this.gvMx2status.Tag = "query_a.status"; this.gvMx2status.Visible = true; this.gvMx2status.VisibleIndex = 1; this.gvMx2status.Width = 71; // // gvMx2pbillNo // this.gvMx2pbillNo.AppearanceCell.Options.UseFont = true; this.gvMx2pbillNo.Caption = "追溯码"; this.gvMx2pbillNo.FieldName = "barCode"; this.gvMx2pbillNo.Name = "gvMx2pbillNo"; this.gvMx2pbillNo.OptionsColumn.ReadOnly = true; this.gvMx2pbillNo.Tag = "query_a.pbill_no"; this.gvMx2pbillNo.Visible = true; this.gvMx2pbillNo.VisibleIndex = 2; this.gvMx2pbillNo.Width = 91; // // gvMx2itemNo // this.gvMx2itemNo.AppearanceCell.Options.UseFont = true; this.gvMx2itemNo.Caption = "物料编码"; this.gvMx2itemNo.FieldName = "itemNo"; this.gvMx2itemNo.Name = "gvMx2itemNo"; this.gvMx2itemNo.OptionsColumn.ReadOnly = true; this.gvMx2itemNo.Tag = "query_a.item_no"; this.gvMx2itemNo.Visible = true; this.gvMx2itemNo.VisibleIndex = 3; this.gvMx2itemNo.Width = 91; // // gridColumn5 // this.gridColumn5.Caption = "物料名称"; this.gridColumn5.FieldName = "itemName"; this.gridColumn5.Name = "gridColumn5"; this.gridColumn5.OptionsColumn.ReadOnly = true; this.gridColumn5.Visible = true; this.gridColumn5.VisibleIndex = 4; this.gridColumn5.Width = 91; // // gridColumn6 // this.gridColumn6.Caption = "规格型号"; this.gridColumn6.FieldName = "itemModel"; this.gridColumn6.Name = "gridColumn6"; this.gridColumn6.OptionsColumn.ReadOnly = true; this.gridColumn6.Visible = true; this.gridColumn6.VisibleIndex = 5; this.gridColumn6.Width = 91; // // gridColumn7 // this.gridColumn7.AppearanceCell.ForeColor = System.Drawing.Color.Blue; this.gridColumn7.AppearanceCell.Options.UseForeColor = true; this.gridColumn7.AppearanceHeader.ForeColor = System.Drawing.Color.Blue; this.gridColumn7.AppearanceHeader.Options.UseForeColor = true; this.gridColumn7.Caption = "修理状态"; this.gridColumn7.FieldName = "repairResult"; this.gridColumn7.MinWidth = 25; this.gridColumn7.Name = "gridColumn7"; this.gridColumn7.Visible = true; this.gridColumn7.VisibleIndex = 6; this.gridColumn7.Width = 91; // // gridColumn2 // this.gridColumn2.Caption = "送修工序"; this.gridColumn2.FieldName = "processNo"; this.gridColumn2.MinWidth = 25; this.gridColumn2.Name = "gridColumn2"; this.gridColumn2.Visible = true; this.gridColumn2.VisibleIndex = 7; this.gridColumn2.Width = 91; // // gridColumn26 // this.gridColumn26.Caption = "送修员"; this.gridColumn26.FieldName = "createBy"; this.gridColumn26.MinWidth = 25; this.gridColumn26.Name = "gridColumn26"; this.gridColumn26.Visible = true; this.gridColumn26.VisibleIndex = 8; this.gridColumn26.Width = 94; // // gridColumn15 // this.gridColumn15.Caption = "送修时间"; this.gridColumn15.FieldName = "createDate"; this.gridColumn15.MinWidth = 25; this.gridColumn15.Name = "gridColumn15"; this.gridColumn15.Visible = true; this.gridColumn15.VisibleIndex = 9; this.gridColumn15.Width = 113; // // gridColumn4 // this.gridColumn4.Caption = "不良描述"; this.gridColumn4.FieldName = "badDescription"; this.gridColumn4.MinWidth = 25; this.gridColumn4.Name = "gridColumn4"; this.gridColumn4.Visible = true; this.gridColumn4.VisibleIndex = 10; this.gridColumn4.Width = 91; // // gridColumn14 // this.gridColumn14.Caption = "不良原因"; this.gridColumn14.FieldName = "repairReson"; this.gridColumn14.MinWidth = 25; this.gridColumn14.Name = "gridColumn14"; this.gridColumn14.Visible = true; this.gridColumn14.VisibleIndex = 11; this.gridColumn14.Width = 94; // // gridColumn25 // this.gridColumn25.Caption = "不良对策"; this.gridColumn25.FieldName = "repairMethd"; this.gridColumn25.MinWidth = 25; this.gridColumn25.Name = "gridColumn25"; this.gridColumn25.Visible = true; this.gridColumn25.VisibleIndex = 12; this.gridColumn25.Width = 94; // // Frm_Repair // @@ -1498,8 +1492,8 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit(); this.layoutMx1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.txt_gdbh.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_gx.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_collectBy.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_processNo.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_barCode.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit(); @@ -1531,12 +1525,12 @@ this.panel1.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit(); this.tabMx.ResumeLayout(false); this.tabMxPage1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit(); this.tabMxPage2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit(); this.tabMxPage1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit(); this.ResumeLayout(false); } @@ -1559,8 +1553,8 @@ private DevExpress.XtraEditors.SplitContainerControl splitTop1; private DevExpress.XtraLayout.LayoutControl layoutMx1; private DevExpress.XtraEditors.TextEdit txt_gdbh; private DevExpress.XtraEditors.TextEdit txt_gx; private DevExpress.XtraEditors.TextEdit txt_collectBy; private DevExpress.XtraEditors.TextEdit txt_processNo; private DevExpress.XtraEditors.TextEdit txt_createBy; private DevExpress.XtraEditors.TextEdit txt_barCode; private DevExpress.XtraEditors.TextEdit txt_itemNo; private DevExpress.XtraEditors.TextEdit txt_itemName; @@ -1598,7 +1592,6 @@ private DevExpress.XtraGrid.Columns.GridColumn gvMx2itemNo; private DevExpress.XtraGrid.Columns.GridColumn gridColumn5; private DevExpress.XtraGrid.Columns.GridColumn gridColumn6; private DevExpress.XtraGrid.Columns.GridColumn gridColumn3; private DevExpress.XtraGrid.Columns.GridColumn gridColumn2; private DevExpress.XtraGrid.Columns.GridColumn gridColumn4; private DevExpress.XtraGrid.Columns.GridColumn gridColumn7; @@ -1608,7 +1601,7 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5; private UcDictionary txt_repairMethd; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18; private UcDictionary txt_badReson; private UcDictionary txt_repairReson; private UcDictionary txt_badDescription; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7; @@ -1641,7 +1634,6 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn17; private DevExpress.XtraGrid.Columns.GridColumn gridColumn27; private DevExpress.XtraGrid.Columns.GridColumn gridColumn28; private DevExpress.XtraGrid.Columns.GridColumn gridColumn29; private DevExpress.XtraGrid.Columns.GridColumn gridColumn30; private DevExpress.XtraGrid.Columns.GridColumn gridColumn31; private DevExpress.XtraGrid.Columns.GridColumn gridColumn32; @@ -1651,5 +1643,6 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn36; private DevExpress.Utils.ToolTipController tips; private DevExpress.XtraGrid.Columns.GridColumn gridColumn37; private DevExpress.XtraGrid.Columns.GridColumn gridColumn38; } } DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs
@@ -45,11 +45,12 @@ }; btnGood.Click += (s, e) => { getModel(lbGuid.Text.Trim(), txt_badDescription.TextTxt, txt_badReson.TextTxt, txt_repairMethd.TextTxt, goodTag); getModel(lbGuid.Text.Trim(), txt_badDescription.TextTxt, txt_repairReson.TextTxt.Trim(), txt_repairMethd.TextTxt.Trim(), goodTag); }; btnBad.Click += (s, e) => { getModel(lbGuid.Text.Trim(), txt_badDescription.TextTxt, txt_badReson.TextTxt, txt_repairMethd.TextTxt, badTag); getModel(lbGuid.Text.Trim(), txt_badDescription.TextTxt, txt_repairReson.TextTxt.Trim(), txt_repairMethd.TextTxt.Trim(), badTag); }; } /// <summary> @@ -174,6 +175,23 @@ /// <param name="_checkResult"></param> private void getModel(string strGuid, string _badXx, string _badYy, string _badDc, string _checkResult) { if (!string.IsNullOrEmpty(_checkResult)) { string _reason = txt_repairReson.TextTxt.Trim(); if (string.IsNullOrEmpty(_reason)) { Toast vm = new Toast(0, "不良原因不能为空！"); vm.Show(); return; }; string _meth = txt_repairMethd.TextTxt.Trim(); if (string.IsNullOrEmpty(_meth)) { Toast vm = new Toast(0, "不良对策不能为空！"); vm.Show(); return; }; } string _barCode = txt_barCode.Text.Trim(); var _obj = new { @@ -198,7 +216,7 @@ lbSum3.Text = dy.lbSum3; prog1.Position = dy.jd; txt_barCode.ReadOnly = false; txt_badReson.IsReadly = false; txt_repairReson.IsReadly = false; txt_repairMethd.IsReadly = false; JObject _job = JObject.Parse(strJson); JArray array = new JArray(); DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs
@@ -29,16 +29,16 @@ 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.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.ColumnDefinition columnDefinition16 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition19 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition20 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition21 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition22 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition23 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition24 = new DevExpress.XtraLayout.RowDefinition(); this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl(); this.splitTop1 = new DevExpress.XtraEditors.SplitContainerControl(); this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl(); @@ -465,38 +465,38 @@ 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; 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; columnDefinition16.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition16.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; columnDefinition13, columnDefinition14, columnDefinition15, columnDefinition16}); rowDefinition19.Height = 100D; rowDefinition19.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition20.Height = 100D; rowDefinition20.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition21.Height = 100D; rowDefinition21.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition22.Height = 100D; rowDefinition22.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition23.Height = 100D; rowDefinition23.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition24.Height = 100D; rowDefinition24.SizeType = System.Windows.Forms.SizeType.Percent; this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { rowDefinition1, rowDefinition2, rowDefinition3, rowDefinition4, rowDefinition5, rowDefinition6}); rowDefinition19, rowDefinition20, rowDefinition21, rowDefinition22, rowDefinition23, rowDefinition24}); this.Root.Size = new System.Drawing.Size(828, 191); this.Root.TextVisible = false; // @@ -1028,8 +1028,6 @@ this.gridColumn1.FieldName = "badDescription"; this.gridColumn1.MinWidth = 25; this.gridColumn1.Name = "gridColumn1"; this.gridColumn1.Visible = true; this.gridColumn1.VisibleIndex = 8; this.gridColumn1.Width = 94; // // gridColumn4 @@ -1045,7 +1043,7 @@ // gridColumn14 // this.gridColumn14.Caption = "上报人"; this.gridColumn14.FieldName = "collectByName"; this.gridColumn14.FieldName = "createBy"; this.gridColumn14.MinWidth = 25; this.gridColumn14.Name = "gridColumn14"; this.gridColumn14.Visible = true; @@ -1054,7 +1052,7 @@ // // gridColumn15 // this.gridColumn15.Caption = "上报时间"; this.gridColumn15.Caption = "最后上报时间"; this.gridColumn15.FieldName = "createDate"; this.gridColumn15.MinWidth = 25; this.gridColumn15.Name = "gridColumn15"; @@ -1225,7 +1223,7 @@ // gridColumn21 // this.gridColumn21.Caption = "上报人"; this.gridColumn21.FieldName = "collectByName"; this.gridColumn21.FieldName = "createBy"; this.gridColumn21.MinWidth = 25; this.gridColumn21.Name = "gridColumn21"; this.gridColumn21.Visible = true; @@ -1248,8 +1246,6 @@ this.gridColumn23.FieldName = "badReson"; this.gridColumn23.MinWidth = 25; this.gridColumn23.Name = "gridColumn23"; this.gridColumn23.Visible = true; this.gridColumn23.VisibleIndex = 12; this.gridColumn23.Width = 94; // // Frm_Work01 DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
@@ -78,9 +78,9 @@ /// </summary> /// <param name="_barCode">条码</param> /// <param name="_checkResult">结果</param> /// <param name="_badReson">原因</param> /// <param name="_badDescription">不良描述</param> /// <returns></returns> private dynamic getObj(string _barCode, string _checkResult, string _badReson = "") private dynamic getObj(string _barCode, string _checkResult, string _badDescription = "") { dynamic _obj = new ExpandoObject(); _obj.barCode = _barCode; @@ -88,7 +88,7 @@ _obj.processNo = txt_gx.Text.Trim();//工序 _obj.banCi = txt_bc.Text.Trim();//班次 _obj.gongWei = txt_gw.Text.Trim();//工位 _obj.badReson = _badReson.Trim();//不良原因 _obj.badDescription = _badDescription.Trim();//不良描述 if (txt_gx.Text.Trim() == fGxTouRu) { return _obj; @@ -179,9 +179,9 @@ /// <summary> /// 上报实体 /// </summary> /// <param name="_checkResult">判定结果</param> /// <param name="_badReson">不良原因，可空</param> private void addModel(string _checkResult, string _badReson = "") /// <param name="_checkResult">结果：√</param> /// <param name="_badDescription">不良描述</param> private void addModel(string _checkResult, string _badDescription = "") { string _barCode = txt_barCode.Text.Trim(); if (string.IsNullOrEmpty(_barCode)) @@ -190,7 +190,7 @@ vm.Show(); return; } dynamic _obj = getObj(_barCode, _checkResult, _badReson); dynamic _obj = getObj(_barCode, _checkResult, _badDescription); if (_obj == null) { Toast vm = new Toast(-1, "~读取数据失败，请检查设备~"); @@ -421,5 +421,7 @@ gvMx1.Columns.Add(newColumn); } } } } DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechniqueShow.Designer.cs
@@ -209,7 +209,7 @@ // welcomeWizardPage1 // this.welcomeWizardPage1.Controls.Add(this.splitMx1); this.welcomeWizardPage1.IntroductionText = "该向导，将把当前物料的工艺信息，复制到一个或多个物料，复制过程中，若重复选择了物料，将自动过滤，只会复制一次！"; this.welcomeWizardPage1.IntroductionText = "该向导，将把当前物料的工艺信息，复制到一个或多个物料，复制过程中，若重复选择了物料，将自动过滤！"; this.welcomeWizardPage1.Margin = new System.Windows.Forms.Padding(4); this.welcomeWizardPage1.Name = "welcomeWizardPage1"; this.welcomeWizardPage1.ProceedText = "点击 Next 继续进行"; @@ -770,7 +770,7 @@ this.wizardPage1.Margin = new System.Windows.Forms.Padding(4); this.wizardPage1.Name = "wizardPage1"; this.wizardPage1.Size = new System.Drawing.Size(998, 540); this.wizardPage1.Text = "选择物料"; this.wizardPage1.Text = "未设置的物料列表"; // // splitLeft // DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechniqueShow.cs
@@ -150,8 +150,7 @@ { gcMain.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); //_sbSqlWhere += " and q.guid is null"; var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "item_no", "asc", "", _sbSqlWhere.ToString()); var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "item_no", "asc", "", _sbSqlWhere.ToString(), "workTechnique"); var json = JsonConvert.SerializeObject(pgq); try { DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -1,6 +1,7 @@ using DevExpress.Utils; using DevExpress.XtraEditors; using DevExpress.XtraEditors.Controls; using DevExpress.XtraEditors.Drawing; using DevExpress.XtraGrid; using DevExpress.XtraGrid.Columns; using DevExpress.XtraGrid.Menu; @@ -115,7 +116,7 @@ wdf.Close(); return responseStr; } /// <summary> /// 根据图片名读取资源文件,不带后缀名 /// </summary> @@ -2172,6 +2173,94 @@ txt_iCount_1.ReadOnly = true; } #region 自定义进度条列 /// <summary> /// 自定义进度条列 /// </summary> /// <param name="view"></param> /// <param name="fieldName">列的字段名</param> /// <param name="warningValue"></param> /// <param name="lessColor"></param> /// <param name="greaterColor"></param> public static void CustomProgressBarColumn(DevExpress.XtraGrid.Views.Grid.GridView view, string fieldName, int warningValue = 50, Brush lessColor = null, Brush greaterColor = null) { var col = view.Columns[fieldName]; if (col == null) return; col.AppearanceCell.Options.UseTextOptions = true; col.AppearanceCell.TextOptions.HAlignment = HorzAlignment.Center; view.CustomDrawCell += (s, e) => { int _handle = e.RowHandle; if (_handle < 0) return; if (e.Column.FieldName == fieldName) { DrawProgressBar(e, warningValue, lessColor, greaterColor); e.Handled = true; DrawEditor(e); } }; } private static void DrawProgressBar(DevExpress.XtraGrid.Views.Base.RowCellCustomDrawEventArgs e, int warningValue = 50, Brush lessColor = null, Brush greaterColor = null) { string d = e.CellValue == null ? null : e.CellValue.ToString(); decimal percent = string.IsNullOrEmpty(d) ? 0m : decimal.Parse(d); if (percent <= 0) percent = 0.1m; int width = (int)(percent * e.Bounds.Width); Rectangle rect = new Rectangle(e.Bounds.X, e.Bounds.Y, width, e.Bounds.Height); Brush b = Brushes.Green; if (greaterColor != null) { b = greaterColor; } if (percent * 100 < warningValue) { if (lessColor == null) { b = Brushes.Red; } else { b = lessColor; } } e.Graphics.FillRectangle(b, rect); } private static void DrawEditor(DevExpress.XtraGrid.Views.Base.RowCellCustomDrawEventArgs e) { GridCellInfo cell = e.Cell as GridCellInfo; Point offset = cell.CellValueRect.Location; BaseEditPainter pb = cell.ViewInfo.Painter as BaseEditPainter; AppearanceObject style = cell.ViewInfo.PaintAppearance; if (!offset.IsEmpty) cell.ViewInfo.Offset(offset.X, offset.Y); try { pb.Draw(new ControlGraphicsInfoArgs(cell.ViewInfo, e.Cache, cell.Bounds)); } finally { if (!offset.IsEmpty) { cell.ViewInfo.Offset(-offset.X, -offset.Y); } } } #endregion #region 绘制表头全选勾选框 /// <summary> /// 绘制表头全选勾选框
