From 7e412b035c84cf6c8b486c8a8249383d715cbc15 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 19 五月 2025 15:58:04 +0800
Subject: [PATCH] 调整oa返回来的结果
---
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs | 52 +-
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs | 460 ++++++++++++-----------
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs | 157 ++++---
DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs | 429 ++++++++-------------
4 files changed, 510 insertions(+), 588 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
index 6e9ab50..8066742 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
@@ -30,22 +30,22 @@
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.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition12 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition15 = 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 rowDefinition16 = new DevExpress.XtraLayout.RowDefinition();
this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
@@ -81,7 +81,6 @@
this.gridColumn30 = 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.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -110,10 +109,12 @@
this.txt_freceQty = new DevExpress.XtraEditors.TextEdit();
this.txt_cgdNo = new DevExpress.XtraEditors.TextEdit();
this.txt_fngHandle = new DevExpress.XtraEditors.TextEdit();
- this.txt_fmrmode = new DevExpress.XtraEditors.TextEdit();
+ this.txt_xblb = new DevExpress.XtraEditors.MemoEdit();
+ this.txt_xbsl = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -132,11 +133,11 @@
this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx2 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -237,10 +238,12 @@
((System.ComponentModel.ISupportInitialize)(this.txt_freceQty.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_cgdNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_xblb.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_xbsl.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
@@ -259,11 +262,11 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit();
this.xtraTabControl2.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -419,8 +422,7 @@
this.gridColumn23,
this.gridColumn30,
this.gridColumn5,
- this.gridColumn6,
- this.gridColumn7});
+ this.gridColumn6});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -465,7 +467,7 @@
this.gv_lotNo.OptionsColumn.AllowEdit = false;
this.gv_lotNo.Tag = "query_a.lot_no";
this.gv_lotNo.Visible = true;
- this.gv_lotNo.VisibleIndex = 6;
+ this.gv_lotNo.VisibleIndex = 5;
this.gv_lotNo.Width = 120;
//
// gv_lifnr
@@ -478,7 +480,7 @@
this.gv_lifnr.OptionsColumn.AllowEdit = false;
this.gv_lifnr.Tag = "query_a.lifnr";
this.gv_lifnr.Visible = true;
- this.gv_lifnr.VisibleIndex = 7;
+ this.gv_lifnr.VisibleIndex = 6;
this.gv_lifnr.Width = 200;
//
// gv_releaseNo
@@ -491,7 +493,7 @@
this.gv_releaseNo.OptionsColumn.AllowEdit = false;
this.gv_releaseNo.Tag = "query_a.release_no";
this.gv_releaseNo.Visible = true;
- this.gv_releaseNo.VisibleIndex = 5;
+ this.gv_releaseNo.VisibleIndex = 4;
this.gv_releaseNo.Width = 100;
//
// gv_itemId
@@ -504,7 +506,7 @@
this.gv_itemId.OptionsColumn.AllowEdit = false;
this.gv_itemId.Tag = "query_a.item_id";
this.gv_itemId.Visible = true;
- this.gv_itemId.VisibleIndex = 8;
+ this.gv_itemId.VisibleIndex = 7;
this.gv_itemId.Width = 30;
//
// gv_itemNo
@@ -517,7 +519,7 @@
this.gv_itemNo.OptionsColumn.AllowEdit = false;
this.gv_itemNo.Tag = "query_a.item_no";
this.gv_itemNo.Visible = true;
- this.gv_itemNo.VisibleIndex = 9;
+ this.gv_itemNo.VisibleIndex = 8;
this.gv_itemNo.Width = 136;
//
// gv_boardStyle
@@ -530,7 +532,7 @@
this.gv_boardStyle.OptionsColumn.AllowEdit = false;
this.gv_boardStyle.Tag = "query_a.board_style";
this.gv_boardStyle.Visible = true;
- this.gv_boardStyle.VisibleIndex = 10;
+ this.gv_boardStyle.VisibleIndex = 9;
this.gv_boardStyle.Width = 164;
//
// gridColumn14
@@ -541,7 +543,7 @@
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.OptionsColumn.ReadOnly = true;
this.gridColumn14.Visible = true;
- this.gridColumn14.VisibleIndex = 11;
+ this.gridColumn14.VisibleIndex = 10;
this.gridColumn14.Width = 200;
//
// gv_fbatchQty
@@ -554,7 +556,7 @@
this.gv_fbatchQty.OptionsColumn.AllowEdit = false;
this.gv_fbatchQty.Tag = "query_a.fbatch_qty";
this.gv_fbatchQty.Visible = true;
- this.gv_fbatchQty.VisibleIndex = 12;
+ this.gv_fbatchQty.VisibleIndex = 11;
this.gv_fbatchQty.Width = 80;
//
// gv_fcheckResu
@@ -592,7 +594,7 @@
this.gv_remarks.OptionsColumn.AllowEdit = false;
this.gv_remarks.Tag = "query_a.remarks";
this.gv_remarks.Visible = true;
- this.gv_remarks.VisibleIndex = 13;
+ this.gv_remarks.VisibleIndex = 12;
this.gv_remarks.Width = 100;
//
// gv_fcheckBy
@@ -605,7 +607,7 @@
this.gv_fcheckBy.OptionsColumn.AllowEdit = false;
this.gv_fcheckBy.Tag = "query_a.fcheck_by";
this.gv_fcheckBy.Visible = true;
- this.gv_fcheckBy.VisibleIndex = 14;
+ this.gv_fcheckBy.VisibleIndex = 13;
this.gv_fcheckBy.Width = 118;
//
// gv_fcheckDate
@@ -618,7 +620,7 @@
this.gv_fcheckDate.OptionsColumn.AllowEdit = false;
this.gv_fcheckDate.Tag = "query_a.fcheck_date";
this.gv_fcheckDate.Visible = true;
- this.gv_fcheckDate.VisibleIndex = 16;
+ this.gv_fcheckDate.VisibleIndex = 15;
this.gv_fcheckDate.Width = 182;
//
// gv_createBy
@@ -631,7 +633,7 @@
this.gv_createBy.OptionsColumn.AllowEdit = false;
this.gv_createBy.Tag = "query_a.create_by";
this.gv_createBy.Visible = true;
- this.gv_createBy.VisibleIndex = 15;
+ this.gv_createBy.VisibleIndex = 14;
this.gv_createBy.Width = 67;
//
// gridColumn15
@@ -641,7 +643,7 @@
this.gridColumn15.MinWidth = 25;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Visible = true;
- this.gridColumn15.VisibleIndex = 17;
+ this.gridColumn15.VisibleIndex = 16;
this.gridColumn15.Width = 94;
//
// gv_lastupdateBy
@@ -654,7 +656,7 @@
this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
this.gv_lastupdateBy.Tag = "query_a.lastupdate_by";
this.gv_lastupdateBy.Visible = true;
- this.gv_lastupdateBy.VisibleIndex = 18;
+ this.gv_lastupdateBy.VisibleIndex = 17;
this.gv_lastupdateBy.Width = 60;
//
// gv_lastupdateDate
@@ -667,20 +669,20 @@
this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
this.gv_lastupdateDate.Tag = "query_a.lastupdate_date";
this.gv_lastupdateDate.Visible = true;
- this.gv_lastupdateDate.VisibleIndex = 19;
+ this.gv_lastupdateDate.VisibleIndex = 18;
this.gv_lastupdateDate.Width = 120;
//
// gv_fngHandle
//
this.gv_fngHandle.AppearanceCell.Options.UseFont = true;
- this.gv_fngHandle.Caption = "澶勭悊缁撴灉";
+ this.gv_fngHandle.Caption = "澶勭悊鎰忚";
this.gv_fngHandle.FieldName = "fngHandle";
this.gv_fngHandle.MinWidth = 30;
this.gv_fngHandle.Name = "gv_fngHandle";
this.gv_fngHandle.OptionsColumn.AllowEdit = false;
this.gv_fngHandle.Tag = "query_a.fng_handle";
this.gv_fngHandle.Visible = true;
- this.gv_fngHandle.VisibleIndex = 20;
+ this.gv_fngHandle.VisibleIndex = 19;
this.gv_fngHandle.Width = 100;
//
// bandedGridColumn1
@@ -691,7 +693,7 @@
this.bandedGridColumn1.Name = "bandedGridColumn1";
this.bandedGridColumn1.Tag = "org.fnamber";
this.bandedGridColumn1.Visible = true;
- this.bandedGridColumn1.VisibleIndex = 22;
+ this.bandedGridColumn1.VisibleIndex = 21;
this.bandedGridColumn1.Width = 250;
//
// gridColumn18
@@ -701,7 +703,7 @@
this.gridColumn18.MinWidth = 25;
this.gridColumn18.Name = "gridColumn18";
this.gridColumn18.Visible = true;
- this.gridColumn18.VisibleIndex = 23;
+ this.gridColumn18.VisibleIndex = 22;
this.gridColumn18.Width = 94;
//
// gridColumn19
@@ -711,7 +713,7 @@
this.gridColumn19.MinWidth = 25;
this.gridColumn19.Name = "gridColumn19";
this.gridColumn19.Visible = true;
- this.gridColumn19.VisibleIndex = 24;
+ this.gridColumn19.VisibleIndex = 23;
this.gridColumn19.Width = 94;
//
// gridColumn17
@@ -729,7 +731,7 @@
this.gridColumn23.MinWidth = 25;
this.gridColumn23.Name = "gridColumn23";
this.gridColumn23.Visible = true;
- this.gridColumn23.VisibleIndex = 25;
+ this.gridColumn23.VisibleIndex = 24;
this.gridColumn23.Width = 94;
//
// gridColumn30
@@ -758,19 +760,7 @@
this.gridColumn6.MinWidth = 25;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.OptionsColumn.ReadOnly = true;
- this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 4;
this.gridColumn6.Width = 94;
- //
- // gridColumn7
- //
- this.gridColumn7.Caption = "閫�鏂欐柟寮�";
- this.gridColumn7.FieldName = "fmrmode";
- this.gridColumn7.MinWidth = 25;
- this.gridColumn7.Name = "gridColumn7";
- this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 21;
- this.gridColumn7.Width = 94;
//
// pageBar1
//
@@ -838,15 +828,17 @@
this.layoutMx1.Controls.Add(this.txt_freceQty);
this.layoutMx1.Controls.Add(this.txt_cgdNo);
this.layoutMx1.Controls.Add(this.txt_fngHandle);
- this.layoutMx1.Controls.Add(this.txt_fmrmode);
+ this.layoutMx1.Controls.Add(this.txt_xblb);
+ this.layoutMx1.Controls.Add(this.txt_xbsl);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem17,
this.layoutControlItem7,
- this.layoutControlItem21});
+ this.layoutControlItem21,
+ this.layoutControlItem23});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
this.layoutMx1.Name = "layoutMx1";
- this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(874, 322, 812, 500);
+ this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(609, 530, 812, 500);
this.layoutMx1.Root = this.Root;
this.layoutMx1.Size = new System.Drawing.Size(1342, 231);
this.layoutMx1.TabIndex = 0;
@@ -855,9 +847,9 @@
// txt_fngDesc
//
this.txt_fngDesc.BtnTxt = "寮傚父澶囨敞";
- this.txt_fngDesc.Location = new System.Drawing.Point(12, 167);
+ this.txt_fngDesc.Location = new System.Drawing.Point(12, 162);
this.txt_fngDesc.Name = "txt_fngDesc";
- this.txt_fngDesc.Size = new System.Drawing.Size(656, 52);
+ this.txt_fngDesc.Size = new System.Drawing.Size(656, 57);
this.txt_fngDesc.TabIndex = 815;
this.txt_fngDesc.TextTxt = "";
this.txt_fngDesc.WhereTxt = "s_type=\'IQC缂洪櫡鎻忚堪\'";
@@ -865,7 +857,7 @@
// btnYcReport
//
this.btnYcReport.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.exporttopdf_16x16;
- this.btnYcReport.Location = new System.Drawing.Point(672, 167);
+ this.btnYcReport.Location = new System.Drawing.Point(672, 192);
this.btnYcReport.Name = "btnYcReport";
this.btnYcReport.Size = new System.Drawing.Size(116, 27);
this.btnYcReport.StyleController = this.layoutMx1;
@@ -884,7 +876,7 @@
//
// txt_suppName
//
- this.txt_suppName.Location = new System.Drawing.Point(414, 105);
+ this.txt_suppName.Location = new System.Drawing.Point(414, 102);
this.txt_suppName.Name = "txt_suppName";
this.txt_suppName.Size = new System.Drawing.Size(254, 24);
this.txt_suppName.StyleController = this.layoutMx1;
@@ -893,7 +885,7 @@
//
// txt_remarks
//
- this.txt_remarks.Location = new System.Drawing.Point(84, 136);
+ this.txt_remarks.Location = new System.Drawing.Point(84, 132);
this.txt_remarks.Name = "txt_remarks";
this.txt_remarks.Properties.Appearance.Options.UseFont = true;
this.txt_remarks.Size = new System.Drawing.Size(584, 24);
@@ -903,7 +895,7 @@
//
// txt_fcheckResu
//
- this.txt_fcheckResu.Location = new System.Drawing.Point(744, 105);
+ this.txt_fcheckResu.Location = new System.Drawing.Point(744, 102);
this.txt_fcheckResu.Name = "txt_fcheckResu";
this.txt_fcheckResu.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txt_fcheckResu.Properties.Appearance.Options.UseForeColor = true;
@@ -914,7 +906,7 @@
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(84, 43);
+ this.txt_itemName.Location = new System.Drawing.Point(84, 42);
this.txt_itemName.Name = "txt_itemName";
this.txt_itemName.Properties.Appearance.Options.UseFont = true;
this.txt_itemName.Size = new System.Drawing.Size(254, 24);
@@ -954,7 +946,7 @@
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(84, 74);
+ this.txt_itemNo.Location = new System.Drawing.Point(84, 72);
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
this.txt_itemNo.Size = new System.Drawing.Size(254, 24);
@@ -964,7 +956,7 @@
//
// txt_itemModel
//
- this.txt_itemModel.Location = new System.Drawing.Point(84, 105);
+ this.txt_itemModel.Location = new System.Drawing.Point(84, 102);
this.txt_itemModel.Name = "txt_itemModel";
this.txt_itemModel.Size = new System.Drawing.Size(254, 24);
this.txt_itemModel.StyleController = this.layoutMx1;
@@ -982,7 +974,7 @@
//
// txt_fcheckBy
//
- this.txt_fcheckBy.Location = new System.Drawing.Point(744, 43);
+ this.txt_fcheckBy.Location = new System.Drawing.Point(744, 42);
this.txt_fcheckBy.Name = "txt_fcheckBy";
this.txt_fcheckBy.Properties.Appearance.Options.UseFont = true;
this.txt_fcheckBy.Size = new System.Drawing.Size(254, 24);
@@ -992,7 +984,7 @@
//
// txt_fbatchQty
//
- this.txt_fbatchQty.Location = new System.Drawing.Point(414, 74);
+ this.txt_fbatchQty.Location = new System.Drawing.Point(414, 72);
this.txt_fbatchQty.Name = "txt_fbatchQty";
this.txt_fbatchQty.Properties.Appearance.Options.UseFont = true;
this.txt_fbatchQty.Size = new System.Drawing.Size(254, 24);
@@ -1002,7 +994,7 @@
//
// txt_fsubmitBy
//
- this.txt_fsubmitBy.Location = new System.Drawing.Point(1074, 43);
+ this.txt_fsubmitBy.Location = new System.Drawing.Point(1074, 42);
this.txt_fsubmitBy.Name = "txt_fsubmitBy";
this.txt_fsubmitBy.Size = new System.Drawing.Size(256, 24);
this.txt_fsubmitBy.StyleController = this.layoutMx1;
@@ -1011,7 +1003,7 @@
//
// txt_fsubmitDate
//
- this.txt_fsubmitDate.Location = new System.Drawing.Point(1074, 74);
+ this.txt_fsubmitDate.Location = new System.Drawing.Point(1074, 72);
this.txt_fsubmitDate.Name = "txt_fsubmitDate";
this.txt_fsubmitDate.Size = new System.Drawing.Size(256, 24);
this.txt_fsubmitDate.StyleController = this.layoutMx1;
@@ -1030,7 +1022,7 @@
//
// txt_slOrg
//
- this.txt_slOrg.Location = new System.Drawing.Point(744, 136);
+ this.txt_slOrg.Location = new System.Drawing.Point(744, 132);
this.txt_slOrg.Name = "txt_slOrg";
this.txt_slOrg.Size = new System.Drawing.Size(254, 24);
this.txt_slOrg.StyleController = this.layoutMx1;
@@ -1048,7 +1040,7 @@
//
// txt_checkStates
//
- this.txt_checkStates.Location = new System.Drawing.Point(744, 74);
+ this.txt_checkStates.Location = new System.Drawing.Point(744, 72);
this.txt_checkStates.Name = "txt_checkStates";
this.txt_checkStates.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txt_checkStates.Properties.Appearance.Options.UseForeColor = true;
@@ -1059,7 +1051,7 @@
//
// txt_freceQty
//
- this.txt_freceQty.Location = new System.Drawing.Point(1074, 105);
+ this.txt_freceQty.Location = new System.Drawing.Point(1074, 102);
this.txt_freceQty.Name = "txt_freceQty";
this.txt_freceQty.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txt_freceQty.Properties.Appearance.Options.UseForeColor = true;
@@ -1070,7 +1062,7 @@
//
// txt_cgdNo
//
- this.txt_cgdNo.Location = new System.Drawing.Point(414, 43);
+ this.txt_cgdNo.Location = new System.Drawing.Point(414, 42);
this.txt_cgdNo.Name = "txt_cgdNo";
this.txt_cgdNo.Size = new System.Drawing.Size(254, 24);
this.txt_cgdNo.StyleController = this.layoutMx1;
@@ -1079,7 +1071,7 @@
//
// txt_fngHandle
//
- this.txt_fngHandle.Location = new System.Drawing.Point(1074, 136);
+ this.txt_fngHandle.Location = new System.Drawing.Point(1074, 102);
this.txt_fngHandle.Name = "txt_fngHandle";
this.txt_fngHandle.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txt_fngHandle.Properties.Appearance.Options.UseForeColor = true;
@@ -1088,16 +1080,21 @@
this.txt_fngHandle.TabIndex = 812;
this.txt_fngHandle.Tag = "readonly";
//
- // txt_fmrmode
+ // txt_xblb
//
- this.txt_fmrmode.Location = new System.Drawing.Point(1074, 167);
- this.txt_fmrmode.Name = "txt_fmrmode";
- this.txt_fmrmode.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
- this.txt_fmrmode.Properties.Appearance.Options.UseForeColor = true;
- this.txt_fmrmode.Size = new System.Drawing.Size(256, 24);
- this.txt_fmrmode.StyleController = this.layoutMx1;
- this.txt_fmrmode.TabIndex = 813;
- this.txt_fmrmode.Tag = "readonly";
+ this.txt_xblb.Location = new System.Drawing.Point(1074, 162);
+ this.txt_xblb.Name = "txt_xblb";
+ this.txt_xblb.Size = new System.Drawing.Size(256, 57);
+ this.txt_xblb.StyleController = this.layoutMx1;
+ this.txt_xblb.TabIndex = 816;
+ //
+ // txt_xbsl
+ //
+ this.txt_xbsl.Location = new System.Drawing.Point(1074, 132);
+ this.txt_xbsl.Name = "txt_xbsl";
+ this.txt_xbsl.Size = new System.Drawing.Size(256, 24);
+ this.txt_xbsl.StyleController = this.layoutMx1;
+ this.txt_xbsl.TabIndex = 817;
//
// layoutControlItem17
//
@@ -1132,6 +1129,17 @@
this.layoutControlItem21.Text = "涓婚敭GUID";
this.layoutControlItem21.TextSize = new System.Drawing.Size(50, 20);
//
+ // layoutControlItem23
+ //
+ this.layoutControlItem23.Control = this.txt_freceQty;
+ this.layoutControlItem23.Location = new System.Drawing.Point(990, 90);
+ this.layoutControlItem23.Name = "layoutControlItem23";
+ this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem23.Size = new System.Drawing.Size(332, 30);
+ this.layoutControlItem23.Text = "鍒ゅ畾缁撴灉";
+ this.layoutControlItem23.TextSize = new System.Drawing.Size(60, 18);
+ //
// Root
//
this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
@@ -1154,48 +1162,48 @@
this.layoutControlItem3,
this.layoutControlItem24,
this.layoutControlItem18,
- this.layoutControlItem23,
+ this.layoutControlItem28,
+ this.layoutControlItem27,
this.layoutControlItem25,
this.layoutControlItem26,
- this.layoutControlItem27,
- this.layoutControlItem28});
+ this.layoutControlItem29});
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;
+ columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition9.Width = 100D;
+ columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition10.Width = 100D;
+ columnDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition11.Width = 100D;
+ columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition12.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;
- rowDefinition7.Height = 25D;
- rowDefinition7.SizeType = System.Windows.Forms.SizeType.AutoSize;
+ columnDefinition9,
+ columnDefinition10,
+ columnDefinition11,
+ columnDefinition12});
+ rowDefinition9.Height = 100D;
+ rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition10.Height = 100D;
+ rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition11.Height = 100D;
+ rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition12.Height = 100D;
+ rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition13.Height = 100D;
+ rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition14.Height = 100D;
+ rowDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition15.Height = 31D;
+ rowDefinition15.SizeType = System.Windows.Forms.SizeType.AutoSize;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition1,
- rowDefinition2,
- rowDefinition3,
- rowDefinition4,
- rowDefinition5,
- rowDefinition6,
- rowDefinition7});
+ rowDefinition9,
+ rowDefinition10,
+ rowDefinition11,
+ rowDefinition12,
+ rowDefinition13,
+ rowDefinition14,
+ rowDefinition15});
this.Root.Size = new System.Drawing.Size(1342, 231);
this.Root.TextVisible = false;
//
@@ -1204,59 +1212,59 @@
this.layoutControlItem1.Control = this.txt_releaseNo;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(330, 31);
+ this.layoutControlItem1.Size = new System.Drawing.Size(330, 30);
this.layoutControlItem1.Text = "妫�楠屽崟鍙�";
this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_itemName;
- this.layoutControlItem4.Location = new System.Drawing.Point(0, 31);
+ this.layoutControlItem4.Location = new System.Drawing.Point(0, 30);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(330, 31);
+ this.layoutControlItem4.Size = new System.Drawing.Size(330, 30);
this.layoutControlItem4.Text = "鐗╂枡鍚嶇О";
this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_itemNo;
- this.layoutControlItem5.Location = new System.Drawing.Point(0, 62);
+ this.layoutControlItem5.Location = new System.Drawing.Point(0, 60);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem5.Size = new System.Drawing.Size(330, 31);
+ this.layoutControlItem5.Size = new System.Drawing.Size(330, 30);
this.layoutControlItem5.Text = "鐗╂枡缂栫爜";
this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_itemModel;
- this.layoutControlItem6.Location = new System.Drawing.Point(0, 93);
+ this.layoutControlItem6.Location = new System.Drawing.Point(0, 90);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem6.Size = new System.Drawing.Size(330, 31);
+ this.layoutControlItem6.Size = new System.Drawing.Size(330, 30);
this.layoutControlItem6.Text = "鐗╂枡瑙勬牸";
this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_fsubmitBy;
- this.layoutControlItem15.Location = new System.Drawing.Point(990, 31);
+ this.layoutControlItem15.Location = new System.Drawing.Point(990, 30);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem15.Size = new System.Drawing.Size(332, 31);
+ this.layoutControlItem15.Size = new System.Drawing.Size(332, 30);
this.layoutControlItem15.Text = "瀹℃牳鏃ユ湡";
this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txt_fsubmitDate;
- this.layoutControlItem16.Location = new System.Drawing.Point(990, 62);
+ this.layoutControlItem16.Location = new System.Drawing.Point(990, 60);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem16.Size = new System.Drawing.Size(332, 31);
+ this.layoutControlItem16.Size = new System.Drawing.Size(332, 30);
this.layoutControlItem16.Text = "瀹℃牳浜哄憳";
this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1266,7 +1274,7 @@
this.layoutControlItem14.Location = new System.Drawing.Point(990, 0);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem14.Size = new System.Drawing.Size(332, 31);
+ this.layoutControlItem14.Size = new System.Drawing.Size(332, 30);
this.layoutControlItem14.Text = "瀹℃牳鏍囪瘑";
this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem14.TextVisible = false;
@@ -1274,66 +1282,66 @@
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_remarks;
- this.layoutControlItem12.Location = new System.Drawing.Point(0, 124);
+ this.layoutControlItem12.Location = new System.Drawing.Point(0, 120);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem12.Size = new System.Drawing.Size(660, 31);
+ this.layoutControlItem12.Size = new System.Drawing.Size(660, 30);
this.layoutControlItem12.Text = "鍒拌揣澶囨敞";
this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_fcheckResu;
- this.layoutControlItem10.Location = new System.Drawing.Point(660, 93);
+ this.layoutControlItem10.Location = new System.Drawing.Point(660, 90);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem10.Size = new System.Drawing.Size(330, 31);
+ this.layoutControlItem10.Size = new System.Drawing.Size(330, 30);
this.layoutControlItem10.Text = "妫�楠岀粨鏋�";
this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_suppName;
- this.layoutControlItem13.Location = new System.Drawing.Point(330, 93);
+ this.layoutControlItem13.Location = new System.Drawing.Point(330, 90);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem13.Size = new System.Drawing.Size(330, 31);
+ this.layoutControlItem13.Size = new System.Drawing.Size(330, 30);
this.layoutControlItem13.Text = "渚涘簲鍟�";
this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem22
//
this.layoutControlItem22.Control = this.txt_checkStates;
- this.layoutControlItem22.Location = new System.Drawing.Point(660, 62);
+ this.layoutControlItem22.Location = new System.Drawing.Point(660, 60);
this.layoutControlItem22.Name = "layoutControlItem22";
this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem22.Size = new System.Drawing.Size(330, 31);
+ this.layoutControlItem22.Size = new System.Drawing.Size(330, 30);
this.layoutControlItem22.Text = "妫�楠岀姸鎬�";
this.layoutControlItem22.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_fbatchQty;
- this.layoutControlItem9.Location = new System.Drawing.Point(330, 62);
+ this.layoutControlItem9.Location = new System.Drawing.Point(330, 60);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem9.Size = new System.Drawing.Size(330, 31);
+ this.layoutControlItem9.Size = new System.Drawing.Size(330, 30);
this.layoutControlItem9.Text = "鏀惰揣鏁伴噺";
this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_fcheckBy;
- this.layoutControlItem8.Location = new System.Drawing.Point(660, 31);
+ this.layoutControlItem8.Location = new System.Drawing.Point(660, 30);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(330, 31);
+ this.layoutControlItem8.Size = new System.Drawing.Size(330, 30);
this.layoutControlItem8.Text = "妫�楠屼汉鍛�";
this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1343,7 +1351,7 @@
this.layoutControlItem2.Location = new System.Drawing.Point(660, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem2.Size = new System.Drawing.Size(330, 31);
+ this.layoutControlItem2.Size = new System.Drawing.Size(330, 30);
this.layoutControlItem2.Text = "妫�楠屾棩鏈�";
this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1353,92 +1361,93 @@
this.layoutControlItem3.Location = new System.Drawing.Point(330, 0);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem3.Size = new System.Drawing.Size(330, 31);
+ this.layoutControlItem3.Size = new System.Drawing.Size(330, 30);
this.layoutControlItem3.Text = "閫佹鎵瑰彿";
this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem24
//
this.layoutControlItem24.Control = this.txt_cgdNo;
- this.layoutControlItem24.Location = new System.Drawing.Point(330, 31);
+ this.layoutControlItem24.Location = new System.Drawing.Point(330, 30);
this.layoutControlItem24.Name = "layoutControlItem24";
this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem24.Size = new System.Drawing.Size(330, 31);
+ this.layoutControlItem24.Size = new System.Drawing.Size(330, 30);
this.layoutControlItem24.Text = "閲囪喘鍗曞彿";
this.layoutControlItem24.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem18
//
this.layoutControlItem18.Control = this.txt_slOrg;
- this.layoutControlItem18.Location = new System.Drawing.Point(660, 124);
+ this.layoutControlItem18.Location = new System.Drawing.Point(660, 120);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem18.Size = new System.Drawing.Size(330, 31);
+ this.layoutControlItem18.Size = new System.Drawing.Size(330, 30);
this.layoutControlItem18.Text = "鏀舵枡缁勭粐";
this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
//
- // layoutControlItem23
+ // layoutControlItem28
//
- this.layoutControlItem23.Control = this.txt_freceQty;
- this.layoutControlItem23.Location = new System.Drawing.Point(990, 93);
- this.layoutControlItem23.Name = "layoutControlItem23";
- this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem23.Size = new System.Drawing.Size(332, 31);
- this.layoutControlItem23.Text = "鍒ゅ畾缁撴灉";
- this.layoutControlItem23.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem25
- //
- this.layoutControlItem25.Control = this.txt_fngHandle;
- this.layoutControlItem25.Location = new System.Drawing.Point(990, 124);
- this.layoutControlItem25.Name = "layoutControlItem25";
- this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem25.Size = new System.Drawing.Size(332, 31);
- this.layoutControlItem25.Text = "澶勭悊缁撴灉";
- this.layoutControlItem25.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem26
- //
- this.layoutControlItem26.Control = this.txt_fmrmode;
- this.layoutControlItem26.Location = new System.Drawing.Point(990, 155);
- this.layoutControlItem26.Name = "layoutControlItem26";
- this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem26.Size = new System.Drawing.Size(332, 31);
- this.layoutControlItem26.Text = "閫�鏂欐柟寮�";
- this.layoutControlItem26.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem28.Control = this.txt_fngDesc;
+ this.layoutControlItem28.Location = new System.Drawing.Point(0, 150);
+ this.layoutControlItem28.Name = "layoutControlItem28";
+ this.layoutControlItem28.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 5;
+ this.layoutControlItem28.OptionsTableLayoutItem.RowSpan = 2;
+ this.layoutControlItem28.Size = new System.Drawing.Size(660, 61);
+ this.layoutControlItem28.Text = "寮傚父澶囨敞";
+ this.layoutControlItem28.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem28.TextVisible = false;
//
// layoutControlItem27
//
this.layoutControlItem27.Control = this.btnYcReport;
- this.layoutControlItem27.Location = new System.Drawing.Point(660, 155);
+ this.layoutControlItem27.Location = new System.Drawing.Point(660, 180);
this.layoutControlItem27.MaxSize = new System.Drawing.Size(120, 31);
this.layoutControlItem27.MinSize = new System.Drawing.Size(120, 31);
this.layoutControlItem27.Name = "layoutControlItem27";
this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 5;
+ this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 6;
this.layoutControlItem27.Size = new System.Drawing.Size(330, 31);
this.layoutControlItem27.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem27.Text = "鏌ョ湅寮傚父鎶ュ憡";
this.layoutControlItem27.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem27.TextVisible = false;
//
- // layoutControlItem28
+ // layoutControlItem25
//
- this.layoutControlItem28.Control = this.txt_fngDesc;
- this.layoutControlItem28.Location = new System.Drawing.Point(0, 155);
- this.layoutControlItem28.Name = "layoutControlItem28";
- this.layoutControlItem28.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem28.OptionsTableLayoutItem.RowSpan = 2;
- this.layoutControlItem28.Size = new System.Drawing.Size(660, 56);
- this.layoutControlItem28.Text = "寮傚父澶囨敞";
- this.layoutControlItem28.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem28.TextVisible = false;
+ this.layoutControlItem25.Control = this.txt_fngHandle;
+ this.layoutControlItem25.Location = new System.Drawing.Point(990, 90);
+ this.layoutControlItem25.Name = "layoutControlItem25";
+ this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem25.Size = new System.Drawing.Size(332, 30);
+ this.layoutControlItem25.Text = "澶勭悊鎰忚";
+ this.layoutControlItem25.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem26
+ //
+ this.layoutControlItem26.Control = this.txt_xblb;
+ this.layoutControlItem26.Location = new System.Drawing.Point(990, 150);
+ this.layoutControlItem26.Name = "layoutControlItem26";
+ this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 5;
+ this.layoutControlItem26.OptionsTableLayoutItem.RowSpan = 2;
+ this.layoutControlItem26.Size = new System.Drawing.Size(332, 61);
+ this.layoutControlItem26.Text = "閫夊埆绫诲埆";
+ this.layoutControlItem26.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem29
+ //
+ this.layoutControlItem29.Control = this.txt_xbsl;
+ this.layoutControlItem29.Location = new System.Drawing.Point(990, 120);
+ this.layoutControlItem29.Name = "layoutControlItem29";
+ this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem29.Size = new System.Drawing.Size(332, 30);
+ this.layoutControlItem29.Text = "鎸戦�夋暟閲�";
+ this.layoutControlItem29.TextSize = new System.Drawing.Size(60, 18);
//
// xtraTabControl2
//
@@ -2017,23 +2026,23 @@
this.layoutControlItem19});
this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup1.Name = "Root";
- columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition5.Width = 100D;
- columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition6.Width = 100D;
- columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition7.Width = 100D;
- columnDefinition8.SizeType = System.Windows.Forms.SizeType.AutoSize;
- columnDefinition8.Width = 110D;
+ 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.AutoSize;
+ columnDefinition16.Width = 110D;
this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition5,
- columnDefinition6,
- columnDefinition7,
- columnDefinition8});
- rowDefinition8.Height = 100D;
- rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition13,
+ columnDefinition14,
+ columnDefinition15,
+ columnDefinition16});
+ rowDefinition16.Height = 100D;
+ rowDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition8});
+ rowDefinition16});
this.layoutControlGroup1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
this.layoutControlGroup1.Size = new System.Drawing.Size(1336, 43);
this.layoutControlGroup1.TextVisible = false;
@@ -2180,10 +2189,12 @@
((System.ComponentModel.ISupportInitialize)(this.txt_freceQty.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_cgdNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_xblb.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_xbsl.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
@@ -2202,11 +2213,11 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit();
this.xtraTabControl2.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -2391,15 +2402,16 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
private DevExpress.XtraEditors.TextEdit txt_fngHandle;
- private DevExpress.XtraEditors.TextEdit txt_fmrmode;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
private DevExpress.XtraEditors.SimpleButton btnYcReport;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
private UserControl.UcDictionary txt_fngDesc;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
+ private DevExpress.XtraEditors.MemoEdit txt_xblb;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
+ private DevExpress.XtraEditors.TextEdit txt_xbsl;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs
index bb5dbe8..c43aeaf 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs
@@ -38,7 +38,6 @@
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.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();
@@ -64,6 +63,7 @@
this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -76,29 +76,14 @@
this.txt_dhdNo = new DevExpress.XtraEditors.TextEdit();
this.txt_gysNo = new DevExpress.XtraEditors.TextEdit();
this.txt_gysName = new DevExpress.XtraEditors.TextEdit();
- this.txt_fmrmode = new DevExpress.XtraEditors.TextEdit();
this.txt_guid = new DevExpress.XtraEditors.TextEdit();
this.txt_fBillNo = new DevExpress.XtraEditors.TextEdit();
this.txt_dhdDate = new DevExpress.XtraEditors.TextEdit();
- this.txt_handResult = new DevExpress.XtraEditors.TextEdit();
- this.txt_handSuggestion = new DevExpress.XtraEditors.TextEdit();
this.txt_fngDesc = new DevExpress.XtraEditors.MemoEdit();
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -125,7 +110,15 @@
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -152,29 +145,14 @@
((System.ComponentModel.ISupportInitialize)(this.txt_dhdNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_gysNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_gysName.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fBillNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_dhdDate.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_handResult.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_handSuggestion.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fngDesc.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -191,6 +169,15 @@
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -438,6 +425,16 @@
this.gridColumn3.VisibleIndex = 13;
this.gridColumn3.Width = 94;
//
+ // gridColumn17
+ //
+ this.gridColumn17.Caption = "寮傚父鍗曞彿";
+ this.gridColumn17.FieldName = "fBillNo";
+ this.gridColumn17.MinWidth = 25;
+ this.gridColumn17.Name = "gridColumn17";
+ this.gridColumn17.Visible = true;
+ this.gridColumn17.VisibleIndex = 1;
+ this.gridColumn17.Width = 94;
+ //
// pageBar1
//
this.pageBar1.CurrentPage = 1;
@@ -475,7 +472,7 @@
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitMx1.Size = new System.Drawing.Size(1126, 570);
- this.splitMx1.SplitterPosition = 185;
+ this.splitMx1.SplitterPosition = 163;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -488,12 +485,9 @@
this.layoutMx1.Controls.Add(this.txt_dhdNo);
this.layoutMx1.Controls.Add(this.txt_gysNo);
this.layoutMx1.Controls.Add(this.txt_gysName);
- this.layoutMx1.Controls.Add(this.txt_fmrmode);
this.layoutMx1.Controls.Add(this.txt_guid);
this.layoutMx1.Controls.Add(this.txt_fBillNo);
this.layoutMx1.Controls.Add(this.txt_dhdDate);
- this.layoutMx1.Controls.Add(this.txt_handResult);
- this.layoutMx1.Controls.Add(this.txt_handSuggestion);
this.layoutMx1.Controls.Add(this.txt_fngDesc);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
@@ -503,7 +497,7 @@
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(598, 453, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1126, 185);
+ this.layoutMx1.Size = new System.Drawing.Size(1126, 163);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
@@ -518,7 +512,7 @@
//
// txt_fType
//
- this.txt_fType.Location = new System.Drawing.Point(927, 96);
+ this.txt_fType.Location = new System.Drawing.Point(927, 12);
this.txt_fType.Name = "txt_fType";
this.txt_fType.Size = new System.Drawing.Size(187, 24);
this.txt_fType.StyleController = this.layoutMx1;
@@ -526,7 +520,7 @@
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(375, 12);
+ this.txt_itemNo.Location = new System.Drawing.Point(99, 40);
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Size = new System.Drawing.Size(185, 24);
this.txt_itemNo.StyleController = this.layoutMx1;
@@ -534,23 +528,23 @@
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(375, 68);
+ this.txt_itemName.Location = new System.Drawing.Point(375, 40);
this.txt_itemName.Name = "txt_itemName";
- this.txt_itemName.Size = new System.Drawing.Size(461, 24);
+ this.txt_itemName.Size = new System.Drawing.Size(185, 24);
this.txt_itemName.StyleController = this.layoutMx1;
this.txt_itemName.TabIndex = 465;
//
// txt_itemModel
//
- this.txt_itemModel.Location = new System.Drawing.Point(375, 40);
+ this.txt_itemModel.Location = new System.Drawing.Point(651, 40);
this.txt_itemModel.Name = "txt_itemModel";
- this.txt_itemModel.Size = new System.Drawing.Size(461, 24);
+ this.txt_itemModel.Size = new System.Drawing.Size(463, 24);
this.txt_itemModel.StyleController = this.layoutMx1;
this.txt_itemModel.TabIndex = 466;
//
// txt_dhdNo
//
- this.txt_dhdNo.Location = new System.Drawing.Point(99, 40);
+ this.txt_dhdNo.Location = new System.Drawing.Point(375, 12);
this.txt_dhdNo.Name = "txt_dhdNo";
this.txt_dhdNo.Size = new System.Drawing.Size(185, 24);
this.txt_dhdNo.StyleController = this.layoutMx1;
@@ -558,7 +552,7 @@
//
// txt_gysNo
//
- this.txt_gysNo.Location = new System.Drawing.Point(99, 96);
+ this.txt_gysNo.Location = new System.Drawing.Point(99, 68);
this.txt_gysNo.Name = "txt_gysNo";
this.txt_gysNo.Size = new System.Drawing.Size(185, 24);
this.txt_gysNo.StyleController = this.layoutMx1;
@@ -566,21 +560,11 @@
//
// txt_gysName
//
- this.txt_gysName.Location = new System.Drawing.Point(375, 96);
+ this.txt_gysName.Location = new System.Drawing.Point(375, 68);
this.txt_gysName.Name = "txt_gysName";
this.txt_gysName.Size = new System.Drawing.Size(461, 24);
this.txt_gysName.StyleController = this.layoutMx1;
this.txt_gysName.TabIndex = 469;
- //
- // txt_fmrmode
- //
- this.txt_fmrmode.Location = new System.Drawing.Point(927, 68);
- this.txt_fmrmode.Name = "txt_fmrmode";
- this.txt_fmrmode.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
- this.txt_fmrmode.Properties.Appearance.Options.UseForeColor = true;
- this.txt_fmrmode.Size = new System.Drawing.Size(187, 24);
- this.txt_fmrmode.StyleController = this.layoutMx1;
- this.txt_fmrmode.TabIndex = 473;
//
// txt_guid
//
@@ -600,39 +584,17 @@
//
// txt_dhdDate
//
- this.txt_dhdDate.Location = new System.Drawing.Point(99, 68);
+ this.txt_dhdDate.Location = new System.Drawing.Point(651, 12);
this.txt_dhdDate.Name = "txt_dhdDate";
this.txt_dhdDate.Size = new System.Drawing.Size(185, 24);
this.txt_dhdDate.StyleController = this.layoutMx1;
this.txt_dhdDate.TabIndex = 481;
//
- // txt_handResult
- //
- this.txt_handResult.Location = new System.Drawing.Point(927, 12);
- this.txt_handResult.Name = "txt_handResult";
- this.txt_handResult.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
- this.txt_handResult.Properties.Appearance.Options.UseForeColor = true;
- this.txt_handResult.Size = new System.Drawing.Size(187, 24);
- this.txt_handResult.StyleController = this.layoutMx1;
- this.txt_handResult.TabIndex = 483;
- this.txt_handResult.Tag = "readonly";
- //
- // txt_handSuggestion
- //
- this.txt_handSuggestion.Location = new System.Drawing.Point(927, 40);
- this.txt_handSuggestion.Name = "txt_handSuggestion";
- this.txt_handSuggestion.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
- this.txt_handSuggestion.Properties.Appearance.Options.UseForeColor = true;
- this.txt_handSuggestion.Size = new System.Drawing.Size(187, 24);
- this.txt_handSuggestion.StyleController = this.layoutMx1;
- this.txt_handSuggestion.TabIndex = 484;
- this.txt_handSuggestion.Tag = "readonly";
- //
// txt_fngDesc
//
- this.txt_fngDesc.Location = new System.Drawing.Point(99, 124);
+ this.txt_fngDesc.Location = new System.Drawing.Point(99, 97);
this.txt_fngDesc.Name = "txt_fngDesc";
- this.txt_fngDesc.Size = new System.Drawing.Size(1015, 52);
+ this.txt_fngDesc.Size = new System.Drawing.Size(1015, 54);
this.txt_fngDesc.StyleController = this.layoutMx1;
this.txt_fngDesc.TabIndex = 485;
//
@@ -665,17 +627,14 @@
this.Root.GroupBordersVisible = false;
this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem2,
- this.layoutControlItem20,
- this.layoutControlItem1,
- this.layoutControlItem21,
- this.layoutControlItem19,
this.layoutControlItem14,
this.layoutControlItem4,
this.layoutControlItem11,
+ this.layoutControlItem1,
+ this.layoutControlItem12,
+ this.layoutControlItem13,
this.layoutControlItem15,
this.layoutControlItem16,
- this.layoutControlItem13,
- this.layoutControlItem12,
this.layoutControlItem3});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
@@ -702,16 +661,13 @@
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;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition1,
rowDefinition2,
rowDefinition3,
rowDefinition4,
- rowDefinition5,
- rowDefinition6});
- this.Root.Size = new System.Drawing.Size(1126, 188);
+ rowDefinition5});
+ this.Root.Size = new System.Drawing.Size(1126, 163);
this.Root.TextVisible = false;
//
// layoutControlItem2
@@ -723,145 +679,13 @@
this.layoutControlItem2.Text = "寮傚父缂栧彿";
this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
//
- // layoutControlItem20
- //
- this.layoutControlItem20.Control = this.txt_fmrmode;
- this.layoutControlItem20.CustomizationFormText = "澶勭悊鏂瑰紡";
- this.layoutControlItem20.Location = new System.Drawing.Point(828, 56);
- this.layoutControlItem20.Name = "layoutControlItem20";
- this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem20.Size = new System.Drawing.Size(278, 28);
- this.layoutControlItem20.Text = "閫�鏂欐柟寮�";
- this.layoutControlItem20.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem1
- //
- this.layoutControlItem1.Control = this.txt_fType;
- this.layoutControlItem1.Location = new System.Drawing.Point(828, 84);
- this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem1.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem1.Size = new System.Drawing.Size(278, 28);
- this.layoutControlItem1.Text = "寮傚父绫诲瀷";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem21
- //
- this.layoutControlItem21.Control = this.txt_handResult;
- this.layoutControlItem21.Location = new System.Drawing.Point(828, 0);
- this.layoutControlItem21.Name = "layoutControlItem21";
- this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem21.Size = new System.Drawing.Size(278, 28);
- this.layoutControlItem21.Text = "鍒ゅ畾缁撴灉";
- this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem19
- //
- this.layoutControlItem19.Control = this.txt_handSuggestion;
- this.layoutControlItem19.Location = new System.Drawing.Point(828, 28);
- this.layoutControlItem19.Name = "layoutControlItem19";
- this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem19.Size = new System.Drawing.Size(278, 28);
- this.layoutControlItem19.Text = "澶勭悊缁撴灉";
- this.layoutControlItem19.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem14
- //
- this.layoutControlItem14.Control = this.txt_dhdNo;
- this.layoutControlItem14.Location = new System.Drawing.Point(0, 28);
- this.layoutControlItem14.Name = "layoutControlItem14";
- this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem14.Size = new System.Drawing.Size(276, 28);
- this.layoutControlItem14.Text = "鍒拌揣鍗曞彿";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem4
- //
- this.layoutControlItem4.Control = this.txt_dhdDate;
- this.layoutControlItem4.Location = new System.Drawing.Point(0, 56);
- this.layoutControlItem4.Name = "layoutControlItem4";
- this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem4.Size = new System.Drawing.Size(276, 28);
- this.layoutControlItem4.Text = "鍒拌揣鍗曟棩鏈�";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem11
- //
- this.layoutControlItem11.Control = this.txt_itemNo;
- this.layoutControlItem11.Location = new System.Drawing.Point(276, 0);
- this.layoutControlItem11.Name = "layoutControlItem11";
- this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem11.Size = new System.Drawing.Size(276, 28);
- this.layoutControlItem11.Text = "鐗╂枡缂栧彿";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem15
- //
- this.layoutControlItem15.Control = this.txt_gysNo;
- this.layoutControlItem15.Location = new System.Drawing.Point(0, 84);
- this.layoutControlItem15.Name = "layoutControlItem15";
- this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem15.Size = new System.Drawing.Size(276, 28);
- this.layoutControlItem15.Text = "渚涘簲鍟嗙紪鍙�";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem16
- //
- this.layoutControlItem16.Control = this.txt_gysName;
- this.layoutControlItem16.Location = new System.Drawing.Point(276, 84);
- this.layoutControlItem16.Name = "layoutControlItem16";
- this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem16.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem16.Size = new System.Drawing.Size(552, 28);
- this.layoutControlItem16.Text = "渚涘簲鍟嗗悕绉�";
- this.layoutControlItem16.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem13
- //
- this.layoutControlItem13.Control = this.txt_itemModel;
- this.layoutControlItem13.Location = new System.Drawing.Point(276, 28);
- this.layoutControlItem13.Name = "layoutControlItem13";
- this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem13.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem13.Size = new System.Drawing.Size(552, 28);
- this.layoutControlItem13.Text = "鐗╂枡瑙勬牸";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem12
- //
- this.layoutControlItem12.Control = this.txt_itemName;
- this.layoutControlItem12.Location = new System.Drawing.Point(276, 56);
- this.layoutControlItem12.Name = "layoutControlItem12";
- this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem12.Size = new System.Drawing.Size(552, 28);
- this.layoutControlItem12.Text = "鐗╂枡鍚嶇О";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem3
- //
- this.layoutControlItem3.Control = this.txt_fngDesc;
- this.layoutControlItem3.Location = new System.Drawing.Point(0, 112);
- this.layoutControlItem3.Name = "layoutControlItem3";
- this.layoutControlItem3.OptionsTableLayoutItem.ColumnSpan = 4;
- this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem3.OptionsTableLayoutItem.RowSpan = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(1106, 56);
- this.layoutControlItem3.Text = "涓嶅悎鏍兼弿杩�";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18);
- //
// tabMx
//
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.Size = new System.Drawing.Size(1126, 373);
+ this.tabMx.Size = new System.Drawing.Size(1126, 395);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -870,7 +694,7 @@
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1124, 341);
+ this.tabMxPage1.Size = new System.Drawing.Size(1124, 363);
this.tabMxPage1.Text = "寮傚父鏄庣粏";
//
// gcMx1
@@ -885,7 +709,7 @@
this.repositoryItemButtonEdit1,
this.rptJYBZ,
this.repositoryItemDateEdit3});
- this.gcMx1.Size = new System.Drawing.Size(1124, 341);
+ this.gcMx1.Size = new System.Drawing.Size(1124, 363);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1130,15 +954,102 @@
this.layoutControlItem10.Size = new System.Drawing.Size(0, 0);
this.layoutControlItem10.TextSize = new System.Drawing.Size(50, 20);
//
- // gridColumn17
+ // layoutControlItem14
//
- this.gridColumn17.Caption = "寮傚父鍗曞彿";
- this.gridColumn17.FieldName = "fBillNo";
- this.gridColumn17.MinWidth = 25;
- this.gridColumn17.Name = "gridColumn17";
- this.gridColumn17.Visible = true;
- this.gridColumn17.VisibleIndex = 1;
- this.gridColumn17.Width = 94;
+ this.layoutControlItem14.Control = this.txt_dhdNo;
+ this.layoutControlItem14.Location = new System.Drawing.Point(276, 0);
+ this.layoutControlItem14.Name = "layoutControlItem14";
+ this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem14.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem14.Text = "鍒拌揣鍗曞彿";
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem4
+ //
+ this.layoutControlItem4.Control = this.txt_dhdDate;
+ this.layoutControlItem4.Location = new System.Drawing.Point(552, 0);
+ this.layoutControlItem4.Name = "layoutControlItem4";
+ this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem4.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem4.Text = "鍒拌揣鍗曟棩鏈�";
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem11
+ //
+ this.layoutControlItem11.Control = this.txt_itemNo;
+ this.layoutControlItem11.Location = new System.Drawing.Point(0, 28);
+ this.layoutControlItem11.Name = "layoutControlItem11";
+ this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem11.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem11.Text = "鐗╂枡缂栧彿";
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem1
+ //
+ this.layoutControlItem1.Control = this.txt_fType;
+ this.layoutControlItem1.Location = new System.Drawing.Point(828, 0);
+ this.layoutControlItem1.Name = "layoutControlItem1";
+ this.layoutControlItem1.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem1.Size = new System.Drawing.Size(278, 28);
+ this.layoutControlItem1.Text = "寮傚父绫诲瀷";
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem12
+ //
+ this.layoutControlItem12.Control = this.txt_itemName;
+ this.layoutControlItem12.Location = new System.Drawing.Point(276, 28);
+ this.layoutControlItem12.Name = "layoutControlItem12";
+ this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem12.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem12.Text = "鐗╂枡鍚嶇О";
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem13
+ //
+ this.layoutControlItem13.Control = this.txt_itemModel;
+ this.layoutControlItem13.Location = new System.Drawing.Point(552, 28);
+ this.layoutControlItem13.Name = "layoutControlItem13";
+ this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem13.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem13.Size = new System.Drawing.Size(554, 28);
+ this.layoutControlItem13.Text = "鐗╂枡瑙勬牸";
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem15
+ //
+ this.layoutControlItem15.Control = this.txt_gysNo;
+ this.layoutControlItem15.Location = new System.Drawing.Point(0, 56);
+ this.layoutControlItem15.Name = "layoutControlItem15";
+ this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem15.Size = new System.Drawing.Size(276, 29);
+ this.layoutControlItem15.Text = "渚涘簲鍟嗙紪鍙�";
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem16
+ //
+ this.layoutControlItem16.Control = this.txt_gysName;
+ this.layoutControlItem16.Location = new System.Drawing.Point(276, 56);
+ this.layoutControlItem16.Name = "layoutControlItem16";
+ this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem16.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem16.Size = new System.Drawing.Size(552, 29);
+ this.layoutControlItem16.Text = "渚涘簲鍟嗗悕绉�";
+ this.layoutControlItem16.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem3
+ //
+ this.layoutControlItem3.Control = this.txt_fngDesc;
+ this.layoutControlItem3.Location = new System.Drawing.Point(0, 85);
+ this.layoutControlItem3.Name = "layoutControlItem3";
+ this.layoutControlItem3.OptionsTableLayoutItem.ColumnSpan = 4;
+ this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem3.OptionsTableLayoutItem.RowSpan = 2;
+ this.layoutControlItem3.Size = new System.Drawing.Size(1106, 58);
+ this.layoutControlItem3.Text = "涓嶅悎鏍兼弿杩�";
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18);
//
// MesQcExceptional
//
@@ -1176,29 +1087,14 @@
((System.ComponentModel.ISupportInitialize)(this.txt_dhdNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_gysNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_gysName.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fBillNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_dhdDate.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_handResult.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_handSuggestion.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fngDesc.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1215,6 +1111,15 @@
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
this.ResumeLayout(false);
}
@@ -1265,7 +1170,6 @@
private DevExpress.XtraEditors.TextEdit txt_dhdNo;
private DevExpress.XtraEditors.TextEdit txt_gysNo;
private DevExpress.XtraEditors.TextEdit txt_gysName;
- private DevExpress.XtraEditors.TextEdit txt_fmrmode;
private DevExpress.XtraEditors.TextEdit txt_guid;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
private DevExpress.XtraEditors.TextEdit txt_fBillNo;
@@ -1278,22 +1182,8 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
private DevExpress.Utils.ToolTipController tips;
private DevExpress.XtraEditors.TextEdit txt_dhdDate;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
- private DevExpress.XtraEditors.TextEdit txt_handResult;
- private DevExpress.XtraEditors.TextEdit txt_handSuggestion;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private DevExpress.XtraEditors.MemoEdit txt_fngDesc;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
@@ -1301,5 +1191,14 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
index 9829dfe..512900c 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
@@ -30,25 +30,25 @@
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.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();
+ 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 rowDefinition16 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition17 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition18 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition19 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition20 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions7 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject25 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject26 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject27 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject28 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions8 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject29 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject30 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject31 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject32 = new DevExpress.Utils.SerializableAppearanceObject();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -147,6 +147,7 @@
this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -763,35 +764,35 @@
this.lab_paperBillNo});
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;
+ columnDefinition13,
+ columnDefinition14,
+ columnDefinition15,
+ columnDefinition16});
+ rowDefinition16.Height = 100D;
+ rowDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition17.Height = 100D;
+ rowDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition18.Height = 100D;
+ rowDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition19.Height = 100D;
+ rowDefinition19.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition20.Height = 100D;
+ rowDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition1,
- rowDefinition2,
- rowDefinition3,
- rowDefinition4,
- rowDefinition5});
+ rowDefinition16,
+ rowDefinition17,
+ rowDefinition18,
+ rowDefinition19,
+ rowDefinition20});
this.Root.Size = new System.Drawing.Size(1231, 175);
this.Root.TextVisible = false;
//
@@ -1022,7 +1023,8 @@
this.gvMxDel,
this.gridColumn14,
this.gridColumn15,
- this.gridColumn16});
+ this.gridColumn16,
+ this.gridColumn2});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -1149,7 +1151,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 +1161,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 +1174,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,7 +1187,7 @@
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
@@ -1198,7 +1200,7 @@
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
@@ -1214,7 +1216,7 @@
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,7 +1233,7 @@
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
@@ -1244,7 +1246,7 @@
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 +1277,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 +1288,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 +1299,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 +1309,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
@@ -1343,10 +1345,10 @@
// repositoryItemButtonEdit2
//
this.repositoryItemButtonEdit2.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.edit_16x16;
- editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions7.Image = global::Gs.DevApp.Properties.Resources.edit_16x16;
+ editorButtonImageOptions7.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, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閫�鏂�", -1, true, true, false, editorButtonImageOptions7, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject25, serializableAppearanceObject26, serializableAppearanceObject27, serializableAppearanceObject28, "", 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);
@@ -1364,10 +1366,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions8.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions8.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions8, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject29, serializableAppearanceObject30, serializableAppearanceObject31, serializableAppearanceObject32, "", 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);
@@ -1378,28 +1380,26 @@
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;
//
// picCheckBox
@@ -1412,6 +1412,16 @@
this.picCheckBox.TabIndex = 6;
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
+ //
+ // 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;
//
// Frm_MesInvItemArn
//
@@ -1582,5 +1592,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
index e0ed264..82fb154 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
@@ -105,6 +105,7 @@
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.split99 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -175,7 +176,6 @@
this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn();
this.rptChongDa = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -220,6 +220,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -264,7 +265,6 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.rptChongDa)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -919,6 +919,17 @@
this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem11.TextVisible = false;
//
+ // layoutControlItem13
+ //
+ this.layoutControlItem13.Control = this.txt_barcodeProgress;
+ this.layoutControlItem13.Location = new System.Drawing.Point(662, 60);
+ this.layoutControlItem13.Name = "layoutControlItem13";
+ this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem13.Size = new System.Drawing.Size(331, 30);
+ this.layoutControlItem13.Text = "鏉＄爜鎵撳嵃姣旂巼";
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
+ //
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -987,7 +998,7 @@
//
this.layoutControl1.Controls.Add(this.txt_iCount_1);
this.layoutControl1.Controls.Add(this.txt_yuliang_1);
- this.layoutControl1.Location = new System.Drawing.Point(692, 76);
+ this.layoutControl1.Location = new System.Drawing.Point(692, 55);
this.layoutControl1.Name = "layoutControl1";
this.layoutControl1.Root = this.layoutControlGroup2;
this.layoutControl1.Size = new System.Drawing.Size(336, 28);
@@ -1072,7 +1083,7 @@
// ucBtnPrint1
//
this.ucBtnPrint1.guidKey = null;
- this.ucBtnPrint1.Location = new System.Drawing.Point(1031, 42);
+ this.ucBtnPrint1.Location = new System.Drawing.Point(1031, 21);
this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint1.Name = "ucBtnPrint1";
this.ucBtnPrint1.rptParameter = "rpt_daa";
@@ -1081,7 +1092,7 @@
//
// radOut
//
- this.radOut.Location = new System.Drawing.Point(1033, 10);
+ this.radOut.Location = new System.Drawing.Point(1033, -11);
this.radOut.Margin = new System.Windows.Forms.Padding(0);
this.radOut.Name = "radOut";
this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
@@ -1095,7 +1106,7 @@
//
// txt_psnQty_1
//
- this.txt_psnQty_1.Location = new System.Drawing.Point(794, 44);
+ this.txt_psnQty_1.Location = new System.Drawing.Point(794, 23);
this.txt_psnQty_1.Name = "txt_psnQty_1";
this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
this.txt_psnQty_1.Properties.UseMaskAsDisplayFormat = true;
@@ -1107,7 +1118,7 @@
//
// txtWlid
//
- this.txtWlid.Location = new System.Drawing.Point(114, 12);
+ this.txtWlid.Location = new System.Drawing.Point(114, -9);
this.txtWlid.Name = "txtWlid";
this.txtWlid.Properties.Appearance.Options.UseFont = true;
this.txtWlid.Properties.ReadOnly = true;
@@ -1117,7 +1128,7 @@
//
// txtWlmc
//
- this.txtWlmc.Location = new System.Drawing.Point(114, 44);
+ this.txtWlmc.Location = new System.Drawing.Point(114, 23);
this.txtWlmc.Name = "txtWlmc";
this.txtWlmc.Properties.Appearance.Options.UseFont = true;
this.txtWlmc.Properties.ReadOnly = true;
@@ -1127,7 +1138,7 @@
//
// txtWlgg
//
- this.txtWlgg.Location = new System.Drawing.Point(114, 76);
+ this.txtWlgg.Location = new System.Drawing.Point(114, 55);
this.txtWlgg.Name = "txtWlgg";
this.txtWlgg.Properties.Appearance.Options.UseFont = true;
this.txtWlgg.Properties.ReadOnly = true;
@@ -1137,7 +1148,7 @@
//
// txt_kQty
//
- this.txt_kQty.Location = new System.Drawing.Point(794, 12);
+ this.txt_kQty.Location = new System.Drawing.Point(794, -9);
this.txt_kQty.Name = "txt_kQty";
this.txt_kQty.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txt_kQty.Properties.Appearance.Options.UseFont = true;
@@ -1149,7 +1160,7 @@
//
// txtQuantity
//
- this.txtQuantity.Location = new System.Drawing.Point(454, 12);
+ this.txtQuantity.Location = new System.Drawing.Point(454, -9);
this.txtQuantity.Name = "txtQuantity";
this.txtQuantity.Properties.Appearance.Options.UseFont = true;
this.txtQuantity.Properties.ReadOnly = true;
@@ -1159,7 +1170,7 @@
//
// txt_yQty
//
- this.txt_yQty.Location = new System.Drawing.Point(454, 44);
+ this.txt_yQty.Location = new System.Drawing.Point(454, 23);
this.txt_yQty.Name = "txt_yQty";
this.txt_yQty.Properties.Appearance.Options.UseFont = true;
this.txt_yQty.Properties.ReadOnly = true;
@@ -1558,8 +1569,8 @@
//
// gridColumn12
//
- this.gridColumn12.Caption = "鍒ゅ畾缁撴灉";
- this.gridColumn12.FieldName = "pdjg";
+ this.gridColumn12.Caption = "澶勭悊鎰忚";
+ this.gridColumn12.FieldName = "clyj";
this.gridColumn12.MinWidth = 25;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Visible = true;
@@ -1771,17 +1782,6 @@
this.rptChongDa.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.rptChongDa.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
//
- // layoutControlItem13
- //
- this.layoutControlItem13.Control = this.txt_barcodeProgress;
- this.layoutControlItem13.Location = new System.Drawing.Point(662, 60);
- this.layoutControlItem13.Name = "layoutControlItem13";
- this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem13.Size = new System.Drawing.Size(331, 30);
- this.layoutControlItem13.Text = "鏉＄爜鎵撳嵃姣旂巼";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
- //
// Frm_ArrivalBarcode
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1835,6 +1835,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1879,7 +1880,6 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.rptChongDa)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
this.ResumeLayout(false);
}
--
Gitblit v1.9.3