From f73b812e0d7bc051191151f2625ce02a22ee3c3a Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期四, 13 二月 2025 14:52:09 +0800 Subject: [PATCH] 细节 --- DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs | 24 +++- DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs | 26 ++-- DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs | 38 +++--- DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs | 182 +++++++++++++++++++---------------- 4 files changed, 149 insertions(+), 121 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs index 376dfa1..99aa5f9 100644 --- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs @@ -29,16 +29,16 @@ /// </summary> private void InitializeComponent() { - 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(); - DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = 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.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox(); this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage(); this.gcMx2 = new DevExpress.XtraGrid.GridControl(); @@ -769,10 +769,10 @@ // repositoryItemButtonEdit2 // this.repositoryItemButtonEdit2.AutoHeight = false; - editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; - editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; + editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; + editorButtonImageOptions1.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, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", 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.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2"; this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick); @@ -1500,10 +1500,10 @@ // repositoryItemButtonEdit1 // this.repositoryItemButtonEdit1.AutoHeight = false; - editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; - editorButtonImageOptions4.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; + editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; + editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉婚櫎", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉婚櫎", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1"; this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick); @@ -1613,7 +1613,7 @@ this.gv_ftwoCheckdate.AppearanceCell.Options.UseFont = true; this.gv_ftwoCheckdate.Caption = "鎵瑰噯鏃ユ湡"; this.gv_ftwoCheckdate.FieldName = "ftwoCheckdate"; - this.gv_ftwoCheckdate.MinWidth = 200; + this.gv_ftwoCheckdate.MinWidth = 50; this.gv_ftwoCheckdate.Name = "gv_ftwoCheckdate"; this.gv_ftwoCheckdate.OptionsColumn.AllowEdit = false; this.gv_ftwoCheckdate.Tag = "query_a.FTWO_CHECKDATE"; @@ -1705,7 +1705,7 @@ this.gv_foneCheckdate.AppearanceCell.Options.UseFont = true; this.gv_foneCheckdate.Caption = "瀹℃牳鏃ユ湡"; this.gv_foneCheckdate.FieldName = "foneCheckdate"; - this.gv_foneCheckdate.MinWidth = 200; + this.gv_foneCheckdate.MinWidth = 50; this.gv_foneCheckdate.Name = "gv_foneCheckdate"; this.gv_foneCheckdate.OptionsColumn.AllowEdit = false; this.gv_foneCheckdate.Tag = "query_a.FONE_CHECKDATE"; @@ -1862,7 +1862,7 @@ this.gv_sampleSizeNo.AppearanceCell.Options.UseFont = true; this.gv_sampleSizeNo.Caption = "鏍囧噯缂栫爜"; this.gv_sampleSizeNo.FieldName = "sampleSizeNo"; - this.gv_sampleSizeNo.MinWidth = 150; + this.gv_sampleSizeNo.MinWidth = 50; this.gv_sampleSizeNo.Name = "gv_sampleSizeNo"; this.gv_sampleSizeNo.OptionsColumn.AllowEdit = false; this.gv_sampleSizeNo.Tag = "query_a.SAMPLE_SIZE_NO"; diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs index 2dbb895..8dd4fa7 100644 --- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs +++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs @@ -89,16 +89,25 @@ { string rowGuid, rowName; (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, - lbGuid, txt_sampleSizeNo, gridView1); + lbGuid, txt_sampleSizeNo, gridView1, "sampleSizeNo"); try { string strJson = UtilityHelper.HttpPost("", _webServiceName + "Approval", JsonConvert.SerializeObject(rowGuid)); ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson); + ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); if (_rtn.rtnCode > 0) { - getPageList(this.pageBar1.CurrentPage); + if (xtraTabControl1.SelectedTabPageIndex == 1) + { + getModel(lbGuid.Text.Trim()); + } + int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid); + gridView1.FocusedRowHandle = rowHandle; + gridView1.SetFocusedRowCellValue("ftwoChecked", true); + gridView1.SetFocusedRowCellValue("isenabled", true); + gridView1.SetFocusedRowCellValue("ftwoCheckor", "宸叉壒鍑�"); + gridView1.SetFocusedRowCellValue("ftwoCheckdate", DateTime.Now.ToString()); } - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); } catch (Exception ex) { @@ -178,7 +187,7 @@ private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e) { string rowGuid = "", rowName = ""; - (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_sampleSizeNo, gridView1); + (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_sampleSizeNo, gridView1, "sampleSizeNo"); if (string.IsNullOrEmpty(rowGuid)) { ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); @@ -412,6 +421,7 @@ gridViews.Add(gvMx1); gridViews.Add(gvMx2); UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false, gridViews); + toolBarMenu1.currentAction = ""; } } catch (Exception ex) @@ -660,9 +670,11 @@ if (_rtn.rtnCode > 0) { if (xtraTabControl1.SelectedTabPageIndex == 1) + { getModel(lbGuid.Text.Trim()); - else - getPageList(this.pageBar1.CurrentPage); + } + int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid); + gridView1.FocusedRowHandle = rowHandle; UtilityHelper.SetCheckIco(gridView1, "foneChecked", "foneCheckor", "foneCheckdate", picCheckBox, this, _inFieldValue.ToString()); } } diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs index 12d3c03..f0d06b9 100644 --- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs @@ -49,6 +49,7 @@ this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn(); this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); @@ -141,7 +142,6 @@ this.txt_createBy = new DevExpress.XtraEditors.TextEdit(); this.lb_billNo = new DevExpress.XtraEditors.LabelControl(); this.txt_billNo = new DevExpress.XtraEditors.TextEdit(); - this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn(); this.tabMxPage2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit(); @@ -359,6 +359,16 @@ this.gridColumn23.Visible = true; this.gridColumn23.VisibleIndex = 10; this.gridColumn23.Width = 94; + // + // gridColumn24 + // + this.gridColumn24.Caption = "鍏ュ簱浣�"; + this.gridColumn24.FieldName = "rkPositon"; + this.gridColumn24.MinWidth = 25; + this.gridColumn24.Name = "gridColumn24"; + this.gridColumn24.Visible = true; + this.gridColumn24.VisibleIndex = 11; + this.gridColumn24.Width = 94; // // gvBtnAlawys // @@ -673,9 +683,9 @@ // ucBtnPrint1 // this.ucBtnPrint1.guidKey = null; - this.ucBtnPrint1.Location = new System.Drawing.Point(541, 59); + this.ucBtnPrint1.Location = new System.Drawing.Point(541, 61); this.ucBtnPrint1.Name = "ucBtnPrint1"; - this.ucBtnPrint1.rptParameter = null; + this.ucBtnPrint1.rptParameter = "rpt_daa"; this.ucBtnPrint1.Size = new System.Drawing.Size(218, 41); this.ucBtnPrint1.TabIndex = 232; // @@ -1420,16 +1430,6 @@ this.txt_billNo.Properties.Appearance.Options.UseFont = true; this.txt_billNo.Size = new System.Drawing.Size(234, 28); this.txt_billNo.TabIndex = 211; - // - // gridColumn24 - // - this.gridColumn24.Caption = "鍏ュ簱浣�"; - this.gridColumn24.FieldName = "rkPositon"; - this.gridColumn24.MinWidth = 25; - this.gridColumn24.Name = "gridColumn24"; - this.gridColumn24.Visible = true; - this.gridColumn24.VisibleIndex = 11; - this.gridColumn24.Width = 94; // // Frm_ArrivalBarcode // diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs index 6867ffb..174e972 100644 --- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs @@ -37,10 +37,11 @@ this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); this.gcMx1 = new DevExpress.XtraGrid.GridControl(); this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView(); - this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn(); this.lb_createDate1 = new DevExpress.XtraEditors.LabelControl(); this.txt_createDate1 = new DevExpress.XtraEditors.TextEdit(); this.lb_itemUnit = new DevExpress.XtraEditors.LabelControl(); @@ -66,10 +67,10 @@ this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); this.tabMx = new DevExpress.XtraTab.XtraTabControl(); this.panel1 = new System.Windows.Forms.Panel(); + this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit(); + this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit(); this.txt_fSubsidiary = new DevExpress.XtraEditors.TextEdit(); this.labelControl6 = new DevExpress.XtraEditors.LabelControl(); - this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit(); - this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit(); this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint(); this.txt_tc_1 = new DevExpress.XtraEditors.CheckEdit(); this.txt_suppNo_1 = new Gs.DevApp.UserControl.UcLookSupplier(); @@ -81,6 +82,7 @@ this.labelControl1 = new DevExpress.XtraEditors.LabelControl(); this.labelControl11 = new DevExpress.XtraEditors.LabelControl(); this.lbGuid = new System.Windows.Forms.Label(); + this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); this.tabMxPage1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit(); @@ -98,9 +100,9 @@ ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit(); this.tabMx.SuspendLayout(); this.panel1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.txt_fSubsidiary.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_fSubsidiary.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_tc_1.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_suppId.Properties)).BeginInit(); this.SuspendLayout(); @@ -115,7 +117,7 @@ this.gvMx1trLotno.Name = "gvMx1trLotno"; this.gvMx1trLotno.Tag = "query_a.TR_LOTNO"; this.gvMx1trLotno.Visible = true; - this.gvMx1trLotno.VisibleIndex = 2; + this.gvMx1trLotno.VisibleIndex = 3; this.gvMx1trLotno.Width = 150; // // gvMx1createBy @@ -128,7 +130,7 @@ this.gvMx1createBy.Name = "gvMx1createBy"; this.gvMx1createBy.Tag = "query_a.CREATE_BY"; this.gvMx1createBy.Visible = true; - this.gvMx1createBy.VisibleIndex = 6; + this.gvMx1createBy.VisibleIndex = 4; this.gvMx1createBy.Width = 94; // // gvMx1quantity @@ -141,7 +143,7 @@ this.gvMx1quantity.Name = "gvMx1quantity"; this.gvMx1quantity.Tag = "query_a.QUANTITY"; this.gvMx1quantity.Visible = true; - this.gvMx1quantity.VisibleIndex = 1; + this.gvMx1quantity.VisibleIndex = 2; this.gvMx1quantity.Width = 94; // // gvMx1itemBarcode @@ -154,7 +156,7 @@ this.gvMx1itemBarcode.Name = "gvMx1itemBarcode"; this.gvMx1itemBarcode.Tag = "query_a.ITEM_BARCODE"; this.gvMx1itemBarcode.Visible = true; - this.gvMx1itemBarcode.VisibleIndex = 0; + this.gvMx1itemBarcode.VisibleIndex = 1; this.gvMx1itemBarcode.Width = 300; // // gvMx1guid @@ -188,51 +190,26 @@ // // gvMx1 // + this.gvMx1.Appearance.HeaderPanel.Options.UseTextOptions = true; + this.gvMx1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap; + this.gvMx1.ColumnPanelRowHeight = 50; this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { this.gvMx1guid, + this.gridColumn2, this.gvMx1itemBarcode, this.gvMx1quantity, this.gvMx1trLotno, - this.gridColumn1, - this.gridColumn2, - this.gridColumn3, this.gvMx1createBy, - this.gridColumn5}); + this.gridColumn5, + this.gridColumn3, + this.gridColumn1, + this.gridColumn6, + this.gridColumn7}); this.gvMx1.GridControl = this.gcMx1; this.gvMx1.Name = "gvMx1"; this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True; this.gvMx1.OptionsFind.ShowSearchNavButtons = false; this.gvMx1.OptionsView.ShowGroupPanel = false; - // - // gridColumn1 - // - this.gridColumn1.Caption = "搴撲綅"; - this.gridColumn1.FieldName = "depostSections"; - this.gridColumn1.MinWidth = 25; - this.gridColumn1.Name = "gridColumn1"; - this.gridColumn1.Visible = true; - this.gridColumn1.VisibleIndex = 3; - this.gridColumn1.Width = 94; - // - // gridColumn2 - // - this.gridColumn2.Caption = "浠撳簱"; - this.gridColumn2.FieldName = "depostCode"; - this.gridColumn2.MinWidth = 25; - this.gridColumn2.Name = "gridColumn2"; - this.gridColumn2.Visible = true; - this.gridColumn2.VisibleIndex = 4; - this.gridColumn2.Width = 94; - // - // gridColumn3 - // - this.gridColumn3.Caption = "浠撳簱鍚嶇О"; - this.gridColumn3.FieldName = "dpName"; - this.gridColumn3.MinWidth = 25; - this.gridColumn3.Name = "gridColumn3"; - this.gridColumn3.Visible = true; - this.gridColumn3.VisibleIndex = 5; - this.gridColumn3.Width = 94; // // gridColumn5 // @@ -241,8 +218,48 @@ this.gridColumn5.MinWidth = 50; this.gridColumn5.Name = "gridColumn5"; this.gridColumn5.Visible = true; - this.gridColumn5.VisibleIndex = 7; + this.gridColumn5.VisibleIndex = 5; this.gridColumn5.Width = 180; + // + // gridColumn3 + // + this.gridColumn3.Caption = "鍏ヤ粨鍚嶇О"; + this.gridColumn3.FieldName = "depotName"; + this.gridColumn3.MinWidth = 25; + this.gridColumn3.Name = "gridColumn3"; + this.gridColumn3.Visible = true; + this.gridColumn3.VisibleIndex = 6; + this.gridColumn3.Width = 94; + // + // gridColumn1 + // + this.gridColumn1.Caption = "鍏ヤ粨搴撲綅"; + this.gridColumn1.FieldName = "depotSectionsCode"; + this.gridColumn1.MinWidth = 25; + this.gridColumn1.Name = "gridColumn1"; + this.gridColumn1.Visible = true; + this.gridColumn1.VisibleIndex = 7; + this.gridColumn1.Width = 94; + // + // gridColumn6 + // + this.gridColumn6.Caption = "鍏ュ簱浜�"; + this.gridColumn6.FieldName = "rkUser"; + this.gridColumn6.MinWidth = 25; + this.gridColumn6.Name = "gridColumn6"; + this.gridColumn6.Visible = true; + this.gridColumn6.VisibleIndex = 8; + this.gridColumn6.Width = 94; + // + // gridColumn7 + // + this.gridColumn7.Caption = "鍏ュ簱鏃堕棿"; + this.gridColumn7.FieldName = "rkDate"; + this.gridColumn7.MinWidth = 25; + this.gridColumn7.Name = "gridColumn7"; + this.gridColumn7.Visible = true; + this.gridColumn7.VisibleIndex = 9; + this.gridColumn7.Width = 94; // // lb_createDate1 // @@ -525,10 +542,10 @@ // panel1 // this.panel1.BackColor = System.Drawing.Color.White; + this.panel1.Controls.Add(this.txt_psnQty_1); + this.panel1.Controls.Add(this.txt_iCount_1); this.panel1.Controls.Add(this.txt_fSubsidiary); this.panel1.Controls.Add(this.labelControl6); - this.panel1.Controls.Add(this.txt_iCount_1); - this.panel1.Controls.Add(this.txt_psnQty_1); this.panel1.Controls.Add(this.ucBtnPrint1); this.panel1.Controls.Add(this.txt_tc_1); this.panel1.Controls.Add(this.txt_suppNo_1); @@ -557,6 +574,22 @@ this.panel1.Size = new System.Drawing.Size(1126, 141); this.panel1.TabIndex = 1; // + // txt_psnQty_1 + // + this.txt_psnQty_1.Location = new System.Drawing.Point(649, 77); + this.txt_psnQty_1.Name = "txt_psnQty_1"; + this.txt_psnQty_1.Size = new System.Drawing.Size(94, 24); + this.txt_psnQty_1.TabIndex = 273; + this.txt_psnQty_1.Tag = "readOnly-1"; + // + // txt_iCount_1 + // + this.txt_iCount_1.Location = new System.Drawing.Point(649, 45); + this.txt_iCount_1.Name = "txt_iCount_1"; + this.txt_iCount_1.Size = new System.Drawing.Size(94, 24); + this.txt_iCount_1.TabIndex = 272; + this.txt_iCount_1.Tag = "readOnly-1"; + // // txt_fSubsidiary // this.txt_fSubsidiary.Location = new System.Drawing.Point(85, 11); @@ -576,36 +609,6 @@ this.labelControl6.Size = new System.Drawing.Size(68, 21); this.labelControl6.TabIndex = 269; this.labelControl6.Text = "浣跨敤缁勭粐"; - // - // txt_iCount_1 - // - this.txt_iCount_1.Location = new System.Drawing.Point(649, 43); - this.txt_iCount_1.Name = "txt_iCount_1"; - this.txt_iCount_1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); - this.txt_iCount_1.Properties.Appearance.Options.UseFont = true; - this.txt_iCount_1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.RegExpMaskManager)); - this.txt_iCount_1.Properties.MaskSettings.Set("mask", "\\d+"); - this.txt_iCount_1.Properties.MaskSettings.Set("placeholder", '\0'); - this.txt_iCount_1.Properties.UseMaskAsDisplayFormat = true; - this.txt_iCount_1.Size = new System.Drawing.Size(94, 28); - this.txt_iCount_1.TabIndex = 268; - this.txt_iCount_1.Tag = "readOnly-1"; - this.txt_iCount_1.ToolTip = "璇疯緭鍏ユ潯鐮佸紶鏁�"; - // - // txt_psnQty_1 - // - this.txt_psnQty_1.Location = new System.Drawing.Point(649, 75); - this.txt_psnQty_1.Name = "txt_psnQty_1"; - this.txt_psnQty_1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); - this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true; - this.txt_psnQty_1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.RegExpMaskManager)); - this.txt_psnQty_1.Properties.MaskSettings.Set("mask", "\\d+"); - this.txt_psnQty_1.Properties.MaskSettings.Set("placeholder", '\0'); - this.txt_psnQty_1.Properties.UseMaskAsDisplayFormat = true; - this.txt_psnQty_1.Size = new System.Drawing.Size(94, 28); - this.txt_psnQty_1.TabIndex = 267; - this.txt_psnQty_1.Tag = "readOnly-1"; - this.txt_psnQty_1.ToolTip = "璇疯緭鍏ユ瘡寮犳潯鐮佺殑鏁伴噺"; // // ucBtnPrint1 // @@ -709,6 +712,17 @@ this.lbGuid.Size = new System.Drawing.Size(0, 21); this.lbGuid.TabIndex = 1; // + // gridColumn2 + // + this.gridColumn2.Caption = "鍏ュ簱鏍囪"; + this.gridColumn2.FieldName = "inChk"; + this.gridColumn2.MaxWidth = 50; + this.gridColumn2.MinWidth = 50; + this.gridColumn2.Name = "gridColumn2"; + this.gridColumn2.Visible = true; + this.gridColumn2.VisibleIndex = 0; + this.gridColumn2.Width = 50; + // // Frm_InitialBarcode // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); @@ -736,9 +750,9 @@ this.tabMx.ResumeLayout(false); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.txt_fSubsidiary.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_fSubsidiary.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_tc_1.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_suppId.Properties)).EndInit(); this.ResumeLayout(false); @@ -791,16 +805,18 @@ private DevExpress.XtraEditors.LabelControl labelControl5; private DevExpress.XtraEditors.LabelControl labelControl4; private DevExpress.XtraGrid.Columns.GridColumn gridColumn1; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn2; private DevExpress.XtraGrid.Columns.GridColumn gridColumn3; private UserControl.UcLookSupplier txt_suppNo_1; private DevExpress.XtraEditors.CheckEdit txt_tc_1; private DevExpress.XtraGrid.Columns.GridColumn gridColumn4; private DevExpress.XtraGrid.Columns.GridColumn gridColumn5; private UserControl.UcBtnPrint ucBtnPrint1; - private DevExpress.XtraEditors.TextEdit txt_iCount_1; - private DevExpress.XtraEditors.TextEdit txt_psnQty_1; private DevExpress.XtraEditors.TextEdit txt_fSubsidiary; private DevExpress.XtraEditors.LabelControl labelControl6; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn6; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn7; + private DevExpress.XtraEditors.TextEdit txt_psnQty_1; + private DevExpress.XtraEditors.TextEdit txt_iCount_1; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn2; } } \ No newline at end of file -- Gitblit v1.9.3