From bb59b3c2baa039889b74aef492a90883d69c4855 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期三, 10 九月 2025 14:38:16 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.Designer.cs | 202 ++++++++++++++++++++++++++++++--------------------
1 files changed, 121 insertions(+), 81 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.Designer.cs
index 5f15d2f..aeb42ca 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.Designer.cs
@@ -110,7 +110,7 @@
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
- this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
+ this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx2 = new DevExpress.XtraGrid.GridControl();
this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gvMx1itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -123,7 +123,7 @@
this.gvMx1depotSectionCode = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
+ this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -133,8 +133,11 @@
this.gvMx2unit = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -194,10 +197,10 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
- this.tabMxPage1.SuspendLayout();
+ this.tabMxPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
- this.tabMxPage2.SuspendLayout();
+ this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
@@ -241,6 +244,7 @@
// split1
//
this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
this.split1.Horizontal = false;
this.split1.Location = new System.Drawing.Point(0, 0);
this.split1.Name = "split1";
@@ -254,8 +258,9 @@
// split1.Panel2
//
this.split1.Panel2.Text = "Panel2";
+ this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.split1.Size = new System.Drawing.Size(1346, 570);
- this.split1.SplitterPosition = 558;
+ this.split1.SplitterPosition = 0;
this.split1.TabIndex = 0;
//
// gcMain1
@@ -293,7 +298,8 @@
this.gridColumn7,
this.gridColumn8,
this.gridColumn9,
- this.gridColumn10});
+ this.gridColumn10,
+ this.gridColumn13});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -349,8 +355,6 @@
this.gv_depotsCode.Name = "gv_depotsCode";
this.gv_depotsCode.OptionsColumn.AllowEdit = false;
this.gv_depotsCode.Tag = "query_a.DEPOTS_CODE";
- this.gv_depotsCode.Visible = true;
- this.gv_depotsCode.VisibleIndex = 3;
this.gv_depotsCode.Width = 94;
//
// gv_depotsId
@@ -583,6 +587,7 @@
//
this.splitMx1.Panel2.Controls.Add(this.tabMx);
this.splitMx1.Panel2.Text = "Panel2";
+ this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitMx1.Size = new System.Drawing.Size(1346, 570);
this.splitMx1.SplitterPosition = 176;
this.splitMx1.TabIndex = 0;
@@ -629,136 +634,136 @@
//
// txt_ckName
//
- this.txt_ckName.Location = new System.Drawing.Point(445, 105);
+ this.txt_ckName.Location = new System.Drawing.Point(415, 105);
this.txt_ckName.Name = "txt_ckName";
this.txt_ckName.Properties.Appearance.Options.UseFont = true;
- this.txt_ckName.Size = new System.Drawing.Size(225, 24);
+ this.txt_ckName.Size = new System.Drawing.Size(255, 24);
this.txt_ckName.StyleController = this.layoutMx1;
this.txt_ckName.TabIndex = 609;
//
// txt_sqRemark
//
- this.txt_sqRemark.Location = new System.Drawing.Point(114, 136);
+ this.txt_sqRemark.Location = new System.Drawing.Point(84, 136);
this.txt_sqRemark.Name = "txt_sqRemark";
this.txt_sqRemark.Properties.Appearance.Options.UseFont = true;
- this.txt_sqRemark.Size = new System.Drawing.Size(556, 24);
+ this.txt_sqRemark.Size = new System.Drawing.Size(586, 24);
this.txt_sqRemark.StyleController = this.layoutMx1;
this.txt_sqRemark.TabIndex = 240;
//
// txt_hz
//
- this.txt_hz.Location = new System.Drawing.Point(114, 105);
+ this.txt_hz.Location = new System.Drawing.Point(84, 105);
this.txt_hz.Name = "txt_hz";
this.txt_hz.Properties.Appearance.Options.UseFont = true;
- this.txt_hz.Size = new System.Drawing.Size(225, 24);
+ this.txt_hz.Size = new System.Drawing.Size(255, 24);
this.txt_hz.StyleController = this.layoutMx1;
this.txt_hz.TabIndex = 602;
//
// txt_checkUser
//
- this.txt_checkUser.Location = new System.Drawing.Point(1107, 12);
+ this.txt_checkUser.Location = new System.Drawing.Point(1077, 12);
this.txt_checkUser.Name = "txt_checkUser";
this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
- this.txt_checkUser.Size = new System.Drawing.Size(227, 24);
+ this.txt_checkUser.Size = new System.Drawing.Size(257, 24);
this.txt_checkUser.StyleController = this.layoutMx1;
this.txt_checkUser.TabIndex = 608;
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(776, 105);
+ this.txt_createDate.Location = new System.Drawing.Point(746, 105);
this.txt_createDate.Name = "txt_createDate";
this.txt_createDate.Properties.Appearance.Options.UseFont = true;
- this.txt_createDate.Size = new System.Drawing.Size(225, 24);
+ this.txt_createDate.Size = new System.Drawing.Size(255, 24);
this.txt_createDate.StyleController = this.layoutMx1;
this.txt_createDate.TabIndex = 222;
//
// txt_lyfx
//
- this.txt_lyfx.Location = new System.Drawing.Point(776, 43);
+ this.txt_lyfx.Location = new System.Drawing.Point(746, 43);
this.txt_lyfx.Name = "txt_lyfx";
this.txt_lyfx.Properties.Appearance.Options.UseFont = true;
- this.txt_lyfx.Size = new System.Drawing.Size(225, 24);
+ this.txt_lyfx.Size = new System.Drawing.Size(255, 24);
this.txt_lyfx.StyleController = this.layoutMx1;
this.txt_lyfx.TabIndex = 604;
//
// txt_hzlx
//
- this.txt_hzlx.Location = new System.Drawing.Point(114, 74);
+ this.txt_hzlx.Location = new System.Drawing.Point(84, 74);
this.txt_hzlx.Name = "txt_hzlx";
this.txt_hzlx.Properties.Appearance.Options.UseFont = true;
- this.txt_hzlx.Size = new System.Drawing.Size(225, 24);
+ this.txt_hzlx.Size = new System.Drawing.Size(255, 24);
this.txt_hzlx.StyleController = this.layoutMx1;
this.txt_hzlx.TabIndex = 600;
//
// txt_gysName
//
- this.txt_gysName.Location = new System.Drawing.Point(445, 74);
+ this.txt_gysName.Location = new System.Drawing.Point(415, 74);
this.txt_gysName.Name = "txt_gysName";
this.txt_gysName.Properties.Appearance.Options.UseFont = true;
- this.txt_gysName.Size = new System.Drawing.Size(225, 24);
+ this.txt_gysName.Size = new System.Drawing.Size(255, 24);
this.txt_gysName.StyleController = this.layoutMx1;
this.txt_gysName.TabIndex = 595;
//
// txt_billNo
//
- this.txt_billNo.Location = new System.Drawing.Point(114, 12);
+ this.txt_billNo.Location = new System.Drawing.Point(84, 12);
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
- this.txt_billNo.Size = new System.Drawing.Size(225, 24);
+ this.txt_billNo.Size = new System.Drawing.Size(255, 24);
this.txt_billNo.StyleController = this.layoutMx1;
this.txt_billNo.TabIndex = 211;
//
// txt_abtNo
//
- this.txt_abtNo.Location = new System.Drawing.Point(445, 12);
+ this.txt_abtNo.Location = new System.Drawing.Point(415, 12);
this.txt_abtNo.Name = "txt_abtNo";
this.txt_abtNo.Properties.Appearance.Options.UseFont = true;
- this.txt_abtNo.Size = new System.Drawing.Size(225, 24);
+ this.txt_abtNo.Size = new System.Drawing.Size(255, 24);
this.txt_abtNo.StyleController = this.layoutMx1;
this.txt_abtNo.TabIndex = 507;
//
// txt_djlx
//
- this.txt_djlx.Location = new System.Drawing.Point(776, 12);
+ this.txt_djlx.Location = new System.Drawing.Point(746, 12);
this.txt_djlx.Name = "txt_djlx";
this.txt_djlx.Properties.Appearance.Options.UseFont = true;
- this.txt_djlx.Size = new System.Drawing.Size(225, 24);
+ this.txt_djlx.Size = new System.Drawing.Size(255, 24);
this.txt_djlx.StyleController = this.layoutMx1;
this.txt_djlx.TabIndex = 598;
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(776, 74);
+ this.txt_createBy.Location = new System.Drawing.Point(746, 74);
this.txt_createBy.Name = "txt_createBy";
this.txt_createBy.Properties.Appearance.Options.UseFont = true;
- this.txt_createBy.Size = new System.Drawing.Size(225, 24);
+ this.txt_createBy.Size = new System.Drawing.Size(255, 24);
this.txt_createBy.StyleController = this.layoutMx1;
this.txt_createBy.TabIndex = 219;
//
// txt_dptName
//
- this.txt_dptName.Location = new System.Drawing.Point(445, 43);
+ this.txt_dptName.Location = new System.Drawing.Point(415, 43);
this.txt_dptName.Name = "txt_dptName";
this.txt_dptName.Properties.Appearance.Options.UseFont = true;
- this.txt_dptName.Size = new System.Drawing.Size(225, 24);
+ this.txt_dptName.Size = new System.Drawing.Size(255, 24);
this.txt_dptName.StyleController = this.layoutMx1;
this.txt_dptName.TabIndex = 596;
//
// txt_kcOrg
//
- this.txt_kcOrg.Location = new System.Drawing.Point(114, 43);
+ this.txt_kcOrg.Location = new System.Drawing.Point(84, 43);
this.txt_kcOrg.Name = "txt_kcOrg";
this.txt_kcOrg.Properties.Appearance.Options.UseFont = true;
- this.txt_kcOrg.Size = new System.Drawing.Size(225, 24);
+ this.txt_kcOrg.Size = new System.Drawing.Size(255, 24);
this.txt_kcOrg.StyleController = this.layoutMx1;
this.txt_kcOrg.TabIndex = 593;
//
// txt_checkDate
//
- this.txt_checkDate.Location = new System.Drawing.Point(1107, 43);
+ this.txt_checkDate.Location = new System.Drawing.Point(1077, 43);
this.txt_checkDate.Name = "txt_checkDate";
this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
- this.txt_checkDate.Size = new System.Drawing.Size(227, 24);
+ this.txt_checkDate.Size = new System.Drawing.Size(257, 24);
this.txt_checkDate.StyleController = this.layoutMx1;
this.txt_checkDate.TabIndex = 587;
//
@@ -773,19 +778,19 @@
//
// txt_lastupdateBy
//
- this.txt_lastupdateBy.Location = new System.Drawing.Point(1107, 105);
+ this.txt_lastupdateBy.Location = new System.Drawing.Point(1077, 105);
this.txt_lastupdateBy.Name = "txt_lastupdateBy";
this.txt_lastupdateBy.Properties.Appearance.Options.UseFont = true;
- this.txt_lastupdateBy.Size = new System.Drawing.Size(227, 24);
+ this.txt_lastupdateBy.Size = new System.Drawing.Size(257, 24);
this.txt_lastupdateBy.StyleController = this.layoutMx1;
this.txt_lastupdateBy.TabIndex = 610;
//
// txt_lastupdateDate
//
- this.txt_lastupdateDate.Location = new System.Drawing.Point(1107, 136);
+ this.txt_lastupdateDate.Location = new System.Drawing.Point(1077, 136);
this.txt_lastupdateDate.Name = "txt_lastupdateDate";
this.txt_lastupdateDate.Properties.Appearance.Options.UseFont = true;
- this.txt_lastupdateDate.Size = new System.Drawing.Size(227, 24);
+ this.txt_lastupdateDate.Size = new System.Drawing.Size(257, 24);
this.txt_lastupdateDate.StyleController = this.layoutMx1;
this.txt_lastupdateDate.TabIndex = 611;
//
@@ -865,7 +870,7 @@
this.layoutControlItem1.Name = "layoutControlItem1";
this.layoutControlItem1.Size = new System.Drawing.Size(331, 31);
this.layoutControlItem1.Text = "鍏ュ簱鍗曞彿";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem2
//
@@ -875,7 +880,7 @@
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem2.Size = new System.Drawing.Size(331, 31);
this.layoutControlItem2.Text = "鐢宠鍗曞彿";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem3
//
@@ -885,7 +890,7 @@
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem3.Size = new System.Drawing.Size(331, 31);
this.layoutControlItem3.Text = "鍗曟嵁绫诲瀷";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem4
//
@@ -894,8 +899,8 @@
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem4.Size = new System.Drawing.Size(333, 31);
- this.layoutControlItem4.Text = "瀹℃牳浜�";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem4.Text = "瀹℃牳浜哄憳";
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem5
//
@@ -905,7 +910,7 @@
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem5.Size = new System.Drawing.Size(331, 31);
this.layoutControlItem5.Text = "搴撳瓨缁勭粐";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem6
//
@@ -916,7 +921,7 @@
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem6.Size = new System.Drawing.Size(331, 31);
this.layoutControlItem6.Text = "閮ㄩ棬";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem7
//
@@ -927,7 +932,7 @@
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem7.Size = new System.Drawing.Size(331, 31);
this.layoutControlItem7.Text = "搴撳瓨鏂瑰悜";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem8
//
@@ -938,7 +943,7 @@
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem8.Size = new System.Drawing.Size(333, 31);
this.layoutControlItem8.Text = "瀹℃牳鏃ユ湡";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem9
//
@@ -948,7 +953,7 @@
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
this.layoutControlItem9.Size = new System.Drawing.Size(331, 31);
this.layoutControlItem9.Text = "璐т富绫诲瀷";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem10
//
@@ -959,7 +964,7 @@
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
this.layoutControlItem10.Size = new System.Drawing.Size(331, 31);
this.layoutControlItem10.Text = "渚涘簲鍟�";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem11
//
@@ -969,8 +974,8 @@
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
this.layoutControlItem11.Size = new System.Drawing.Size(331, 31);
- this.layoutControlItem11.Text = "鍒涘缓浜�";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem11.Text = "鍒涘缓浜哄憳";
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem12
//
@@ -992,7 +997,7 @@
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
this.layoutControlItem13.Size = new System.Drawing.Size(331, 31);
this.layoutControlItem13.Text = "璐т富";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem14
//
@@ -1003,7 +1008,7 @@
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3;
this.layoutControlItem14.Size = new System.Drawing.Size(331, 31);
this.layoutControlItem14.Text = "浠撳簱鍚嶇О";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem15
//
@@ -1014,7 +1019,7 @@
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
this.layoutControlItem15.Size = new System.Drawing.Size(331, 31);
this.layoutControlItem15.Text = "鍒涘缓鏃堕棿";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem16
//
@@ -1025,7 +1030,7 @@
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 4;
this.layoutControlItem16.Size = new System.Drawing.Size(662, 32);
this.layoutControlItem16.Text = "鐢宠澶囨敞";
- this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem17
//
@@ -1035,8 +1040,8 @@
this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 3;
this.layoutControlItem17.Size = new System.Drawing.Size(333, 31);
- this.layoutControlItem17.Text = "鏈�鍚庢洿鏂颁汉";
- this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem17.Text = "鏇存柊浜哄憳";
+ this.layoutControlItem17.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem18
//
@@ -1046,27 +1051,27 @@
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4;
this.layoutControlItem18.Size = new System.Drawing.Size(333, 32);
- this.layoutControlItem18.Text = "鏈�鍚庢洿鏂版椂闂�";
- this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem18.Text = "鏇存柊鏃堕棿";
+ this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 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.SelectedTabPage = this.tabMxPage2;
this.tabMx.Size = new System.Drawing.Size(1346, 382);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
- this.tabMxPage2,
- this.tabMxPage1});
+ this.tabMxPage1,
+ this.tabMxPage2});
//
- // tabMxPage1
+ // tabMxPage2
//
- this.tabMxPage1.Controls.Add(this.gcMx2);
- this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1344, 350);
- this.tabMxPage1.Text = "鍏ュ簱鏉＄爜";
+ this.tabMxPage2.Controls.Add(this.gcMx2);
+ this.tabMxPage2.Name = "tabMxPage2";
+ this.tabMxPage2.Size = new System.Drawing.Size(1344, 350);
+ this.tabMxPage2.Text = "鍏ュ簱鏉＄爜";
//
// gcMx2
//
@@ -1216,12 +1221,12 @@
this.gridColumn2.VisibleIndex = 9;
this.gridColumn2.Width = 94;
//
- // tabMxPage2
+ // tabMxPage1
//
- this.tabMxPage2.Controls.Add(this.gcMx1);
- this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1344, 350);
- this.tabMxPage2.Text = "鐗╂枡鏄庣粏";
+ this.tabMxPage1.Controls.Add(this.gcMx1);
+ this.tabMxPage1.Name = "tabMxPage1";
+ this.tabMxPage1.Size = new System.Drawing.Size(1344, 350);
+ this.tabMxPage1.Text = "鐗╂枡鏄庣粏";
//
// gcMx1
//
@@ -1243,7 +1248,9 @@
this.gvMx2quantity,
this.gvMx2unit,
this.gridColumn5,
- this.gridColumn6});
+ this.gridColumn6,
+ this.gridColumn11,
+ this.gridColumn12});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1328,6 +1335,26 @@
this.gridColumn6.VisibleIndex = 6;
this.gridColumn6.Width = 94;
//
+ // gridColumn11
+ //
+ this.gridColumn11.Caption = "鐢宠澶囨敞";
+ this.gridColumn11.FieldName = "sqRemark";
+ this.gridColumn11.MinWidth = 25;
+ this.gridColumn11.Name = "gridColumn11";
+ this.gridColumn11.Visible = true;
+ this.gridColumn11.VisibleIndex = 7;
+ this.gridColumn11.Width = 94;
+ //
+ // gridColumn12
+ //
+ this.gridColumn12.Caption = "鐗╂枡ID";
+ this.gridColumn12.FieldName = "itemId";
+ this.gridColumn12.MinWidth = 25;
+ this.gridColumn12.Name = "gridColumn12";
+ this.gridColumn12.Visible = true;
+ this.gridColumn12.VisibleIndex = 8;
+ this.gridColumn12.Width = 94;
+ //
// picCheckBox
//
this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
@@ -1338,6 +1365,16 @@
this.picCheckBox.TabIndex = 6;
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
+ //
+ // gridColumn13
+ //
+ this.gridColumn13.Caption = "鍏ュ簱绫诲瀷";
+ this.gridColumn13.FieldName = "qtlx";
+ this.gridColumn13.MinWidth = 25;
+ this.gridColumn13.Name = "gridColumn13";
+ this.gridColumn13.Visible = true;
+ this.gridColumn13.VisibleIndex = 3;
+ this.gridColumn13.Width = 94;
//
// Frm_MesItemQtrkDj
//
@@ -1408,10 +1445,10 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
- this.tabMxPage1.ResumeLayout(false);
+ this.tabMxPage2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
- this.tabMxPage2.ResumeLayout(false);
+ this.tabMxPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
@@ -1487,7 +1524,7 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
private DevExpress.XtraTab.XtraTabControl tabMx;
- private DevExpress.XtraTab.XtraTabPage tabMxPage1;
+ private DevExpress.XtraTab.XtraTabPage tabMxPage2;
private DevExpress.XtraGrid.GridControl gcMx2;
private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemBarcode;
@@ -1500,7 +1537,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gvMx1depotSectionCode;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
- private DevExpress.XtraTab.XtraTabPage tabMxPage2;
+ private DevExpress.XtraTab.XtraTabPage tabMxPage1;
private DevExpress.XtraGrid.GridControl gcMx1;
private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
@@ -1515,5 +1552,8 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
private DevExpress.Utils.ToolTipController tips;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
}
}
\ No newline at end of file
--
Gitblit v1.9.3