From 34e30e2261a057fc9f46f67a3d216e3d9a9e67be Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期二, 03 六月 2025 17:17:21 +0800 Subject: [PATCH] 上线梳理 --- DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs | 116 +++++++++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 86 insertions(+), 30 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs index 9829dfe..3444b7f 100644 --- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs @@ -49,6 +49,11 @@ 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.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject(); this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu(); this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage(); @@ -145,6 +150,10 @@ this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.rptHistory = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); + this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn(); this.picCheckBox = new System.Windows.Forms.PictureBox(); this.tips = new DevExpress.Utils.ToolTipController(this.components); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); @@ -203,6 +212,7 @@ ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.rptHistory)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit(); this.SuspendLayout(); // @@ -944,7 +954,7 @@ this.layoutControlItem17.OptionsTableLayoutItem.ColumnSpan = 2; this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 3; this.layoutControlItem17.Size = new System.Drawing.Size(606, 31); - this.layoutControlItem17.Text = "澶囨敞淇℃伅"; + this.layoutControlItem17.Text = "鏀舵枡澶囨敞"; this.layoutControlItem17.TextSize = new System.Drawing.Size(75, 18); // // lab_paperBillNo @@ -974,7 +984,7 @@ this.tabMxPage1.Controls.Add(this.gcMx1); this.tabMxPage1.Name = "tabMxPage1"; this.tabMxPage1.Size = new System.Drawing.Size(1229, 351); - this.tabMxPage1.Text = "鍏ヤ粨鐗╂枡鏄庣粏"; + this.tabMxPage1.Text = "鏀舵枡鏄庣粏"; // // gcMx1 // @@ -984,7 +994,8 @@ this.gcMx1.Name = "gcMx1"; this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemButtonEdit1, - this.repositoryItemButtonEdit2}); + this.repositoryItemButtonEdit2, + this.rptHistory}); this.gcMx1.Size = new System.Drawing.Size(1229, 351); this.gcMx1.TabIndex = 0; this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { @@ -1022,7 +1033,10 @@ this.gvMxDel, this.gridColumn14, this.gridColumn15, - this.gridColumn16}); + this.gridColumn16, + this.gridColumn2, + this.gridColumn17, + this.gridColumn18}); this.gvMx1.GridControl = this.gcMx1; this.gvMx1.Name = "gvMx1"; this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False; @@ -1042,7 +1056,7 @@ // gvMx1guid // this.gvMx1guid.AppearanceCell.Options.UseFont = true; - this.gvMx1guid.Caption = "涓婚敭GUID"; + this.gvMx1guid.Caption = "鍒拌揣鏄庣粏GUID"; this.gvMx1guid.FieldName = "guid"; this.gvMx1guid.MinWidth = 70; this.gvMx1guid.Name = "gvMx1guid"; @@ -1053,8 +1067,8 @@ // gvMx1ebelnLine // this.gvMx1ebelnLine.AppearanceCell.Options.UseFont = true; - this.gvMx1ebelnLine.Caption = "ERP琛孖D"; - this.gvMx1ebelnLine.FieldName = "ebelnK3id"; + this.gvMx1ebelnLine.Caption = "Erp琛孖d"; + this.gvMx1ebelnLine.FieldName = "lineK3id"; this.gvMx1ebelnLine.MinWidth = 90; this.gvMx1ebelnLine.Name = "gvMx1ebelnLine"; this.gvMx1ebelnLine.OptionsColumn.ReadOnly = true; @@ -1149,7 +1163,7 @@ this.gvMx1ebeln.OptionsColumn.ReadOnly = true; this.gvMx1ebeln.Tag = "query_a.ebeln"; this.gvMx1ebeln.Visible = true; - this.gvMx1ebeln.VisibleIndex = 5; + this.gvMx1ebeln.VisibleIndex = 4; this.gvMx1ebeln.Width = 120; // // gridColumn8 @@ -1159,7 +1173,7 @@ this.gridColumn8.MinWidth = 25; this.gridColumn8.Name = "gridColumn8"; this.gridColumn8.Visible = true; - this.gridColumn8.VisibleIndex = 6; + this.gridColumn8.VisibleIndex = 5; this.gridColumn8.Width = 70; // // gvMx1boardStyle @@ -1172,7 +1186,7 @@ this.gvMx1boardStyle.OptionsColumn.ReadOnly = true; this.gvMx1boardStyle.Tag = "query_a.board_style"; this.gvMx1boardStyle.Visible = true; - this.gvMx1boardStyle.VisibleIndex = 7; + this.gvMx1boardStyle.VisibleIndex = 6; this.gvMx1boardStyle.Width = 180; // // gvMx1ebelnQty @@ -1185,20 +1199,20 @@ this.gvMx1ebelnQty.OptionsColumn.ReadOnly = true; this.gvMx1ebelnQty.Tag = "query_a.ebeln_qty"; this.gvMx1ebelnQty.Visible = true; - this.gvMx1ebelnQty.VisibleIndex = 8; + this.gvMx1ebelnQty.VisibleIndex = 7; this.gvMx1ebelnQty.Width = 80; // // gvMx1subQty // this.gvMx1subQty.AppearanceCell.Options.UseFont = true; - this.gvMx1subQty.Caption = "鏈敹鏁伴噺"; + this.gvMx1subQty.Caption = "绱鏈敹閲�"; this.gvMx1subQty.FieldName = "wssl"; this.gvMx1subQty.MinWidth = 25; this.gvMx1subQty.Name = "gvMx1subQty"; this.gvMx1subQty.OptionsColumn.ReadOnly = true; this.gvMx1subQty.Tag = "query_a.sub_qty"; this.gvMx1subQty.Visible = true; - this.gvMx1subQty.VisibleIndex = 10; + this.gvMx1subQty.VisibleIndex = 9; this.gvMx1subQty.Width = 80; // // gvMx1quantity @@ -1208,13 +1222,13 @@ this.gvMx1quantity.AppearanceCell.Options.UseForeColor = true; this.gvMx1quantity.AppearanceHeader.ForeColor = System.Drawing.Color.Blue; this.gvMx1quantity.AppearanceHeader.Options.UseForeColor = true; - this.gvMx1quantity.Caption = "鏀惰揣鏁伴噺"; + this.gvMx1quantity.Caption = "鏈鏀堕噺"; this.gvMx1quantity.FieldName = "quantity"; this.gvMx1quantity.MinWidth = 25; this.gvMx1quantity.Name = "gvMx1quantity"; this.gvMx1quantity.Tag = "yz_quantity_0_edit"; this.gvMx1quantity.Visible = true; - this.gvMx1quantity.VisibleIndex = 11; + this.gvMx1quantity.VisibleIndex = 10; this.gvMx1quantity.Width = 80; // // gvMx1memo @@ -1231,20 +1245,20 @@ this.gvMx1memo.OptionsColumn.ReadOnly = true; this.gvMx1memo.Tag = "edit"; this.gvMx1memo.Visible = true; - this.gvMx1memo.VisibleIndex = 12; + this.gvMx1memo.VisibleIndex = 11; this.gvMx1memo.Width = 180; // // gvMx1okRkqty // this.gvMx1okRkqty.AppearanceCell.Options.UseFont = true; - this.gvMx1okRkqty.Caption = "宸叉敹鏁伴噺"; + this.gvMx1okRkqty.Caption = "绱瀹炴敹"; this.gvMx1okRkqty.FieldName = "yssl"; this.gvMx1okRkqty.MinWidth = 25; this.gvMx1okRkqty.Name = "gvMx1okRkqty"; this.gvMx1okRkqty.OptionsColumn.ReadOnly = true; this.gvMx1okRkqty.Tag = "query_a.ok_rkqty"; this.gvMx1okRkqty.Visible = true; - this.gvMx1okRkqty.VisibleIndex = 9; + this.gvMx1okRkqty.VisibleIndex = 8; this.gvMx1okRkqty.Width = 80; // // gvMx1checkDate @@ -1275,7 +1289,7 @@ this.gridColumn9.Name = "gridColumn9"; this.gridColumn9.OptionsColumn.ReadOnly = true; this.gridColumn9.Visible = true; - this.gridColumn9.VisibleIndex = 13; + this.gridColumn9.VisibleIndex = 12; this.gridColumn9.Width = 50; // // gridColumn7 @@ -1286,7 +1300,7 @@ this.gridColumn7.Name = "gridColumn7"; this.gridColumn7.OptionsColumn.ReadOnly = true; this.gridColumn7.Visible = true; - this.gridColumn7.VisibleIndex = 14; + this.gridColumn7.VisibleIndex = 13; this.gridColumn7.Width = 50; // // gridColumn6 @@ -1297,7 +1311,7 @@ this.gridColumn6.Name = "gridColumn6"; this.gridColumn6.OptionsColumn.ReadOnly = true; this.gridColumn6.Visible = true; - this.gridColumn6.VisibleIndex = 15; + this.gridColumn6.VisibleIndex = 14; this.gridColumn6.Width = 180; // // gridColumn10 @@ -1307,7 +1321,7 @@ this.gridColumn10.MinWidth = 25; this.gridColumn10.Name = "gridColumn10"; this.gridColumn10.Visible = true; - this.gridColumn10.VisibleIndex = 16; + this.gridColumn10.VisibleIndex = 18; this.gridColumn10.Width = 94; // // gridColumn12 @@ -1378,29 +1392,66 @@ this.gridColumn14.FieldName = "freceQty"; this.gridColumn14.MinWidth = 25; this.gridColumn14.Name = "gridColumn14"; - this.gridColumn14.Visible = true; - this.gridColumn14.VisibleIndex = 4; this.gridColumn14.Width = 94; // // gridColumn15 // - this.gridColumn15.Caption = "澶勭悊缁撴灉"; - this.gridColumn15.FieldName = "czjg"; + this.gridColumn15.Caption = "澶勭悊鎰忚"; + this.gridColumn15.FieldName = "clyj"; this.gridColumn15.MinWidth = 25; this.gridColumn15.Name = "gridColumn15"; this.gridColumn15.Visible = true; - this.gridColumn15.VisibleIndex = 17; + this.gridColumn15.VisibleIndex = 15; this.gridColumn15.Width = 94; // // gridColumn16 // - this.gridColumn16.Caption = "閫�鐞嗘柟寮�"; - this.gridColumn16.FieldName = "tlfs"; + this.gridColumn16.Caption = "鎸戦�夋暟閲�"; + this.gridColumn16.FieldName = "txsl"; this.gridColumn16.MinWidth = 25; this.gridColumn16.Name = "gridColumn16"; this.gridColumn16.Visible = true; - this.gridColumn16.VisibleIndex = 18; + this.gridColumn16.VisibleIndex = 16; this.gridColumn16.Width = 94; + // + // gridColumn2 + // + this.gridColumn2.Caption = "閫夊埆绫诲埆"; + this.gridColumn2.FieldName = "xblb"; + this.gridColumn2.MinWidth = 25; + this.gridColumn2.Name = "gridColumn2"; + this.gridColumn2.Visible = true; + this.gridColumn2.VisibleIndex = 17; + this.gridColumn2.Width = 94; + // + // gridColumn17 + // + this.gridColumn17.Caption = "鍒拌揣璁板綍"; + this.gridColumn17.ColumnEdit = this.rptHistory; + this.gridColumn17.MinWidth = 25; + this.gridColumn17.Name = "gridColumn17"; + this.gridColumn17.Visible = true; + this.gridColumn17.VisibleIndex = 23; + this.gridColumn17.Width = 94; + // + // rptHistory + // + this.rptHistory.AutoHeight = false; + editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.historyitem_16x16; + editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; + this.rptHistory.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "璁板綍", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); + this.rptHistory.Name = "rptHistory"; + this.rptHistory.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; + this.rptHistory.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptHistory_ButtonClick); + // + // gridColumn18 + // + this.gridColumn18.Caption = "ErpId"; + this.gridColumn18.FieldName = "ebelnK3id"; + this.gridColumn18.MinWidth = 25; + this.gridColumn18.Name = "gridColumn18"; + this.gridColumn18.Width = 94; // // picCheckBox // @@ -1479,6 +1530,7 @@ ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.rptHistory)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit(); this.ResumeLayout(false); @@ -1582,5 +1634,9 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn14; private DevExpress.XtraGrid.Columns.GridColumn gridColumn15; private DevExpress.XtraGrid.Columns.GridColumn gridColumn16; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn2; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn17; + private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptHistory; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn18; } } \ No newline at end of file -- Gitblit v1.9.3