From a5691a54ff0f13af00d48b49a44f25dc3144ef0d Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期三, 12 二月 2025 14:03:37 +0800
Subject: [PATCH] 其它入库
---
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs | 102 +++++++++++++++++-----------------
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.Designer.cs | 32 ----------
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.cs | 25 +++++--
3 files changed, 68 insertions(+), 91 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
index 81ad8ec..1c97352 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
@@ -29,16 +29,16 @@
/// </summary>
private void InitializeComponent()
{
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions25 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject97 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject98 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject99 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject100 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions26 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject101 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject102 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject103 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject104 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.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();
this.gvMx1qd010 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1qd009 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1qd008 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -127,6 +127,8 @@
this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.panel1 = new System.Windows.Forms.Panel();
+ this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
+ this.ucLookHuoZhu1 = new Gs.DevApp.UserControl.UcLookHuoZhu();
this.labelControl6 = new DevExpress.XtraEditors.LabelControl();
this.txt_qt022 = new Gs.DevApp.UserControl.UcLookOrg();
this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
@@ -140,8 +142,6 @@
this.lbGuid = new System.Windows.Forms.Label();
this.lb_qt011 = new DevExpress.XtraEditors.LabelControl();
this.picCheckBox = new System.Windows.Forms.PictureBox();
- this.ucLookHuoZhu1 = new Gs.DevApp.UserControl.UcLookHuoZhu();
- this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
@@ -191,7 +191,7 @@
this.gvMx1qd010.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1qd010.Caption = "澶囨敞 ";
this.gvMx1qd010.FieldName = "qd010";
- this.gvMx1qd010.MinWidth = 250;
+ this.gvMx1qd010.MinWidth = 25;
this.gvMx1qd010.Name = "gvMx1qd010";
this.gvMx1qd010.Tag = "edit";
this.gvMx1qd010.Visible = true;
@@ -204,7 +204,7 @@
this.gvMx1qd009.AppearanceCell.Options.UseFont = true;
this.gvMx1qd009.Caption = "鍗曚綅 ";
this.gvMx1qd009.FieldName = "qd009";
- this.gvMx1qd009.MinWidth = 50;
+ this.gvMx1qd009.MinWidth = 25;
this.gvMx1qd009.Name = "gvMx1qd009";
this.gvMx1qd009.OptionsColumn.AllowEdit = false;
this.gvMx1qd009.OptionsColumn.ReadOnly = true;
@@ -219,7 +219,7 @@
this.gvMx1qd008.AppearanceCell.Options.UseFont = true;
this.gvMx1qd008.Caption = "宸插叆鏁伴噺 ";
this.gvMx1qd008.FieldName = "qd008";
- this.gvMx1qd008.MinWidth = 50;
+ this.gvMx1qd008.MinWidth = 25;
this.gvMx1qd008.Name = "gvMx1qd008";
this.gvMx1qd008.OptionsColumn.AllowEdit = false;
this.gvMx1qd008.OptionsColumn.ReadOnly = true;
@@ -238,7 +238,7 @@
this.gvMx1qd007.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1qd007.Caption = "鐢宠鏁伴噺 ";
this.gvMx1qd007.FieldName = "qd007";
- this.gvMx1qd007.MinWidth = 50;
+ this.gvMx1qd007.MinWidth = 25;
this.gvMx1qd007.Name = "gvMx1qd007";
this.gvMx1qd007.Tag = "edit";
this.gvMx1qd007.Visible = true;
@@ -251,7 +251,7 @@
this.gvMx1qd004.AppearanceCell.Options.UseFont = true;
this.gvMx1qd004.Caption = "瑙勬牸鍨嬪彿 ";
this.gvMx1qd004.FieldName = "qd004";
- this.gvMx1qd004.MinWidth = 250;
+ this.gvMx1qd004.MinWidth = 25;
this.gvMx1qd004.Name = "gvMx1qd004";
this.gvMx1qd004.OptionsColumn.AllowEdit = false;
this.gvMx1qd004.OptionsColumn.ReadOnly = true;
@@ -266,7 +266,7 @@
this.gvMx1qd003.AppearanceCell.Options.UseFont = true;
this.gvMx1qd003.Caption = "鐗╂枡鍚嶇О ";
this.gvMx1qd003.FieldName = "qd003";
- this.gvMx1qd003.MinWidth = 150;
+ this.gvMx1qd003.MinWidth = 25;
this.gvMx1qd003.Name = "gvMx1qd003";
this.gvMx1qd003.OptionsColumn.AllowEdit = false;
this.gvMx1qd003.OptionsColumn.ReadOnly = true;
@@ -281,7 +281,7 @@
this.gvMx1qd002.AppearanceCell.Options.UseFont = true;
this.gvMx1qd002.Caption = "鐗╂枡缂栧彿 ";
this.gvMx1qd002.FieldName = "qd002";
- this.gvMx1qd002.MinWidth = 150;
+ this.gvMx1qd002.MinWidth = 25;
this.gvMx1qd002.Name = "gvMx1qd002";
this.gvMx1qd002.OptionsColumn.AllowEdit = false;
this.gvMx1qd002.OptionsColumn.ReadOnly = true;
@@ -296,7 +296,7 @@
this.gvMx1qd001.AppearanceCell.Options.UseFont = true;
this.gvMx1qd001.Caption = "宸ュ崟鍙� ";
this.gvMx1qd001.FieldName = "qd001";
- this.gvMx1qd001.MinWidth = 50;
+ this.gvMx1qd001.MinWidth = 25;
this.gvMx1qd001.Name = "gvMx1qd001";
this.gvMx1qd001.OptionsColumn.AllowEdit = false;
this.gvMx1qd001.OptionsColumn.ReadOnly = true;
@@ -309,7 +309,7 @@
this.gvMx1qtrkGuid.AppearanceCell.Options.UseFont = true;
this.gvMx1qtrkGuid.Caption = "qtrkGuid ";
this.gvMx1qtrkGuid.FieldName = "qtrkGuid";
- this.gvMx1qtrkGuid.MinWidth = 50;
+ this.gvMx1qtrkGuid.MinWidth = 25;
this.gvMx1qtrkGuid.Name = "gvMx1qtrkGuid";
this.gvMx1qtrkGuid.OptionsColumn.AllowEdit = false;
this.gvMx1qtrkGuid.OptionsColumn.ReadOnly = true;
@@ -322,7 +322,7 @@
this.gvMx1guid.AppearanceCell.Options.UseFont = true;
this.gvMx1guid.Caption = "guid ";
this.gvMx1guid.FieldName = "guid";
- this.gvMx1guid.MinWidth = 50;
+ this.gvMx1guid.MinWidth = 25;
this.gvMx1guid.Name = "gvMx1guid";
this.gvMx1guid.OptionsColumn.AllowEdit = false;
this.gvMx1guid.OptionsColumn.ReadOnly = true;
@@ -382,7 +382,7 @@
this.gridColumn1.Caption = "鐗╂枡ID";
this.gridColumn1.ColumnEdit = this.repositoryItemSearchLookUpEdit1;
this.gridColumn1.FieldName = "itemId";
- this.gridColumn1.MinWidth = 100;
+ this.gridColumn1.MinWidth = 25;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Tag = "edit";
this.gridColumn1.Visible = true;
@@ -477,10 +477,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions25.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions25.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, editorButtonImageOptions25, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject97, serializableAppearanceObject98, serializableAppearanceObject99, serializableAppearanceObject100, "", 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);
@@ -1102,7 +1102,7 @@
this.gvMx1itemBarcode.AppearanceCell.Options.UseFont = true;
this.gvMx1itemBarcode.Caption = "鐗╂枡鏉＄爜";
this.gvMx1itemBarcode.FieldName = "itemBarcode";
- this.gvMx1itemBarcode.MinWidth = 300;
+ this.gvMx1itemBarcode.MinWidth = 25;
this.gvMx1itemBarcode.Name = "gvMx1itemBarcode";
this.gvMx1itemBarcode.Tag = "query_a.ITEM_BARCODE";
this.gvMx1itemBarcode.Visible = true;
@@ -1168,7 +1168,7 @@
this.gvMx1createBy.AppearanceCell.Options.UseFont = true;
this.gvMx1createBy.Caption = "鍒涘缓浜�";
this.gvMx1createBy.FieldName = "createBy";
- this.gvMx1createBy.MinWidth = 50;
+ this.gvMx1createBy.MinWidth = 25;
this.gvMx1createBy.Name = "gvMx1createBy";
this.gvMx1createBy.Tag = "query_a.CREATE_BY";
this.gvMx1createBy.Visible = true;
@@ -1181,7 +1181,7 @@
this.gvMx1lotDate.AppearanceCell.Options.UseFont = true;
this.gvMx1lotDate.Caption = "鍒涘缓鏃ユ湡";
this.gvMx1lotDate.FieldName = "createDate";
- this.gvMx1lotDate.MinWidth = 50;
+ this.gvMx1lotDate.MinWidth = 25;
this.gvMx1lotDate.Name = "gvMx1lotDate";
this.gvMx1lotDate.Tag = "query_a.LOT_DATE";
this.gvMx1lotDate.Visible = true;
@@ -1201,10 +1201,10 @@
// repositoryItemButtonEdit2
//
this.repositoryItemButtonEdit2.AutoHeight = false;
- editorButtonImageOptions26.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions26.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions26, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject101, serializableAppearanceObject102, serializableAppearanceObject103, serializableAppearanceObject104, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
@@ -1245,6 +1245,25 @@
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(1167, 168);
this.panel1.TabIndex = 1;
+ //
+ // labelControl2
+ //
+ this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl2.Appearance.Options.UseFont = true;
+ this.labelControl2.Location = new System.Drawing.Point(54, 107);
+ this.labelControl2.Name = "labelControl2";
+ this.labelControl2.Size = new System.Drawing.Size(34, 21);
+ this.labelControl2.TabIndex = 330;
+ this.labelControl2.Text = "璐т富";
+ //
+ // ucLookHuoZhu1
+ //
+ this.ucLookHuoZhu1.IsReadly = false;
+ this.ucLookHuoZhu1.Location = new System.Drawing.Point(95, 80);
+ this.ucLookHuoZhu1.Name = "ucLookHuoZhu1";
+ this.ucLookHuoZhu1.OrgId = null;
+ this.ucLookHuoZhu1.Size = new System.Drawing.Size(263, 55);
+ this.ucLookHuoZhu1.TabIndex = 329;
//
// labelControl6
//
@@ -1377,25 +1396,6 @@
this.picCheckBox.TabIndex = 5;
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
- //
- // ucLookHuoZhu1
- //
- this.ucLookHuoZhu1.IsReadly = false;
- this.ucLookHuoZhu1.Location = new System.Drawing.Point(95, 80);
- this.ucLookHuoZhu1.Name = "ucLookHuoZhu1";
- this.ucLookHuoZhu1.OrgId = null;
- this.ucLookHuoZhu1.Size = new System.Drawing.Size(263, 55);
- this.ucLookHuoZhu1.TabIndex = 329;
- //
- // labelControl2
- //
- this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.labelControl2.Appearance.Options.UseFont = true;
- this.labelControl2.Location = new System.Drawing.Point(54, 107);
- this.labelControl2.Name = "labelControl2";
- this.labelControl2.Size = new System.Drawing.Size(34, 21);
- this.labelControl2.TabIndex = 330;
- this.labelControl2.Text = "璐т富";
//
// Frm_MesItemQtrk
//
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.Designer.cs
index 7c70921..2507b7d 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.Designer.cs
@@ -115,7 +115,6 @@
this.gv_custName = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_iqcReleaseNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_pickIns = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_fcheckUser = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_rbillNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_bgr = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gridBand2 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
@@ -129,7 +128,6 @@
this.gridBand6 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_checkDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_insDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_fcheckDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gridBand7 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gridBand10 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_depotsId = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
@@ -806,8 +804,6 @@
this.gv_iqcReleaseNo,
this.gv_cbillNo,
this.gv_pickIns,
- this.gv_fcheckUser,
- this.gv_fcheckDate,
this.gv_rbillNo,
this.gv_bgr,
this.gv_suppId});
@@ -861,7 +857,6 @@
this.gridBand1.Columns.Add(this.gv_custName);
this.gridBand1.Columns.Add(this.gv_iqcReleaseNo);
this.gridBand1.Columns.Add(this.gv_pickIns);
- this.gridBand1.Columns.Add(this.gv_fcheckUser);
this.gridBand1.Columns.Add(this.gv_rbillNo);
this.gridBand1.Columns.Add(this.gv_bgr);
this.gridBand1.MinWidth = 50;
@@ -1314,18 +1309,6 @@
this.gv_pickIns.Tag = "query_a.PICK_INS";
this.gv_pickIns.Width = 64;
//
- // gv_fcheckUser
- //
- this.gv_fcheckUser.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_fcheckUser.AppearanceCell.Options.UseFont = true;
- this.gv_fcheckUser.Caption = "鍏ュ簱瀹℃牳浜� ";
- this.gv_fcheckUser.FieldName = "fcheckUser";
- this.gv_fcheckUser.MinWidth = 25;
- this.gv_fcheckUser.Name = "gv_fcheckUser";
- this.gv_fcheckUser.OptionsColumn.AllowEdit = false;
- this.gv_fcheckUser.Tag = "query_a.FCHECK_USER";
- this.gv_fcheckUser.Width = 64;
- //
// gv_rbillNo
//
this.gv_rbillNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1443,7 +1426,6 @@
this.gridBand6.Caption = "瀹℃牳鏃ユ湡";
this.gridBand6.Columns.Add(this.gv_checkDate);
this.gridBand6.Columns.Add(this.gv_insDate);
- this.gridBand6.Columns.Add(this.gv_fcheckDate);
this.gridBand6.MinWidth = 25;
this.gridBand6.Name = "gridBand6";
this.gridBand6.VisibleIndex = 5;
@@ -1473,18 +1455,6 @@
this.gv_insDate.OptionsColumn.AllowEdit = false;
this.gv_insDate.Tag = "query_a.INS_DATE";
this.gv_insDate.Width = 64;
- //
- // gv_fcheckDate
- //
- this.gv_fcheckDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_fcheckDate.AppearanceCell.Options.UseFont = true;
- this.gv_fcheckDate.Caption = "鍏ュ簱瀹℃牳鏃ユ湡 ";
- this.gv_fcheckDate.FieldName = "fcheckDate";
- this.gv_fcheckDate.MinWidth = 25;
- this.gv_fcheckDate.Name = "gv_fcheckDate";
- this.gv_fcheckDate.OptionsColumn.AllowEdit = false;
- this.gv_fcheckDate.Tag = "query_a.FCHECK_DATE";
- this.gv_fcheckDate.Width = 138;
//
// gridBand7
//
@@ -1932,8 +1902,6 @@
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_iqcReleaseNo;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_cbillNo;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_pickIns;
- private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_fcheckUser;
- private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_fcheckDate;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_rbillNo;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_bgr;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_suppId;
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.cs
index a2d2af2..8b79579 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.cs
@@ -1,16 +1,11 @@
-锘縰sing DevExpress.RichEdit.Export;
-using Gs.DevApp.Entity;
+锘縰sing Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
-using System.ComponentModel;
using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
@@ -25,6 +20,7 @@
InitializeComponent();
this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
+ toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
@@ -49,6 +45,20 @@
Task.Delay(100);
getPageList(1);
}
+ /// <summary>
+ /// 鏃ュ織
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnLogClick(object sender, EventArgs e)
+ {
+ toolBarMenu1.guidKey = "";
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_billNo, gridView1);
+ toolBarMenu1.guidKey = rowGuid;
+ }
+
/// <summary>
/// 鍒嗛〉浜嬩欢
/// </summary>
@@ -288,14 +298,13 @@
int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
gridView1.FocusedRowHandle = rowHandle;
Form parentForm = this.FindForm();
- UtilityHelper.SetCheckIco(gridView1, "status2", "fcheckUser", "fcheckDate", picCheckBox, parentForm, _inFieldValue.ToString());
+ UtilityHelper.SetCheckIco(gridView1, "status2", "checkUser", "checkUser", picCheckBox, parentForm, _inFieldValue.ToString());
}
}
catch (Exception ex)
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
-
}
}
}
\ No newline at end of file
--
Gitblit v1.9.3