From cd47f11ebfaadb81d6efcf778542d3b44acee5a2 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期三, 03 九月 2025 17:27:46 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs | 387 +++++++++++++++++++++++++++++++++----------------------
1 files changed, 231 insertions(+), 156 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs
index 7227e72..a45f682 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs
@@ -73,7 +73,7 @@
this.txt_remark = new DevExpress.XtraEditors.TextEdit();
this.txt_daa001 = new DevExpress.XtraEditors.TextEdit();
this.txt_wgTime = new DevExpress.XtraEditors.TextEdit();
- this.txt_wgUser = new DevExpress.XtraEditors.TextEdit();
+ this.txt_kgTime = new DevExpress.XtraEditors.TextEdit();
this.txt_daa014 = new DevExpress.XtraEditors.TextEdit();
this.txt_daa018 = new DevExpress.XtraEditors.TextEdit();
this.txt_blStateTxt = new DevExpress.XtraEditors.TextEdit();
@@ -86,16 +86,18 @@
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -111,14 +113,18 @@
this.gvMx1dab007 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1dab021 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1dab009 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1dab017 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1dab018 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1dab001 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1dab012 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1dab002 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -141,7 +147,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa001.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_wgTime.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_wgUser.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_kgTime.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa014.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa018.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_blStateTxt.Properties)).BeginInit();
@@ -154,23 +160,23 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -268,7 +274,8 @@
this.gridColumn9,
this.gridColumn10,
this.gridColumn11,
- this.gridColumn12});
+ this.gridColumn12,
+ this.gridColumn20});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -304,7 +311,7 @@
this.gridColumn3.MinWidth = 50;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 2;
+ this.gridColumn3.VisibleIndex = 4;
this.gridColumn3.Width = 94;
//
// gridColumn2
@@ -314,7 +321,7 @@
this.gridColumn2.MinWidth = 50;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 3;
+ this.gridColumn2.VisibleIndex = 5;
this.gridColumn2.Width = 150;
//
// gridColumn1
@@ -324,7 +331,7 @@
this.gridColumn1.MinWidth = 50;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 4;
+ this.gridColumn1.VisibleIndex = 6;
this.gridColumn1.Width = 150;
//
// gv_daa008
@@ -337,7 +344,7 @@
this.gv_daa008.OptionsColumn.AllowEdit = false;
this.gv_daa008.Tag = "query_a.daa008";
this.gv_daa008.Visible = true;
- this.gv_daa008.VisibleIndex = 5;
+ this.gv_daa008.VisibleIndex = 7;
this.gv_daa008.Width = 50;
//
// gv_unit
@@ -350,7 +357,7 @@
this.gv_unit.OptionsColumn.AllowEdit = false;
this.gv_unit.Tag = "query_a.unit";
this.gv_unit.Visible = true;
- this.gv_unit.VisibleIndex = 6;
+ this.gv_unit.VisibleIndex = 8;
this.gv_unit.Width = 50;
//
// gv_daa014
@@ -363,7 +370,7 @@
this.gv_daa014.OptionsColumn.AllowEdit = false;
this.gv_daa014.Tag = "query_a.daa014";
this.gv_daa014.Visible = true;
- this.gv_daa014.VisibleIndex = 7;
+ this.gv_daa014.VisibleIndex = 3;
this.gv_daa014.Width = 50;
//
// gv_daa011
@@ -455,7 +462,7 @@
this.gv_remark.OptionsColumn.AllowEdit = false;
this.gv_remark.Tag = "query_a.remark";
this.gv_remark.Visible = true;
- this.gv_remark.VisibleIndex = 8;
+ this.gv_remark.VisibleIndex = 9;
this.gv_remark.Width = 94;
//
// gridColumn8
@@ -465,7 +472,7 @@
this.gridColumn8.MinWidth = 25;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 9;
+ this.gridColumn8.VisibleIndex = 10;
this.gridColumn8.Width = 94;
//
// gridColumn9
@@ -474,8 +481,6 @@
this.gridColumn9.FieldName = "cgdxh";
this.gridColumn9.MinWidth = 25;
this.gridColumn9.Name = "gridColumn9";
- this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 10;
this.gridColumn9.Width = 94;
//
// gridColumn10
@@ -485,7 +490,7 @@
this.gridColumn10.MinWidth = 25;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 11;
+ this.gridColumn10.VisibleIndex = 2;
this.gridColumn10.Width = 94;
//
// gridColumn11
@@ -495,7 +500,7 @@
this.gridColumn11.MinWidth = 25;
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.Visible = true;
- this.gridColumn11.VisibleIndex = 12;
+ this.gridColumn11.VisibleIndex = 11;
this.gridColumn11.Width = 94;
//
// gridColumn12
@@ -505,7 +510,7 @@
this.gridColumn12.MinWidth = 25;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Visible = true;
- this.gridColumn12.VisibleIndex = 13;
+ this.gridColumn12.VisibleIndex = 12;
this.gridColumn12.Width = 94;
//
// pageBar1
@@ -554,7 +559,7 @@
this.layoutMx1.Controls.Add(this.txt_remark);
this.layoutMx1.Controls.Add(this.txt_daa001);
this.layoutMx1.Controls.Add(this.txt_wgTime);
- this.layoutMx1.Controls.Add(this.txt_wgUser);
+ this.layoutMx1.Controls.Add(this.txt_kgTime);
this.layoutMx1.Controls.Add(this.txt_daa014);
this.layoutMx1.Controls.Add(this.txt_daa018);
this.layoutMx1.Controls.Add(this.txt_blStateTxt);
@@ -586,125 +591,125 @@
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(99, 98);
+ this.txt_remark.Location = new System.Drawing.Point(116, 98);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Options.UseFont = true;
this.txt_remark.Properties.ReadOnly = true;
- this.txt_remark.Size = new System.Drawing.Size(461, 24);
+ this.txt_remark.Size = new System.Drawing.Size(444, 24);
this.txt_remark.StyleController = this.layoutMx1;
this.txt_remark.TabIndex = 312;
//
// txt_daa001
//
- this.txt_daa001.Location = new System.Drawing.Point(99, 12);
+ this.txt_daa001.Location = new System.Drawing.Point(116, 12);
this.txt_daa001.Name = "txt_daa001";
this.txt_daa001.Properties.Appearance.Options.UseFont = true;
this.txt_daa001.Properties.ReadOnly = true;
- this.txt_daa001.Size = new System.Drawing.Size(185, 24);
+ this.txt_daa001.Size = new System.Drawing.Size(168, 24);
this.txt_daa001.StyleController = this.layoutMx1;
this.txt_daa001.TabIndex = 216;
//
// txt_wgTime
//
- this.txt_wgTime.Location = new System.Drawing.Point(927, 69);
+ this.txt_wgTime.Location = new System.Drawing.Point(944, 69);
this.txt_wgTime.Name = "txt_wgTime";
this.txt_wgTime.Properties.Appearance.Options.UseFont = true;
this.txt_wgTime.Properties.ReadOnly = true;
- this.txt_wgTime.Size = new System.Drawing.Size(187, 24);
+ this.txt_wgTime.Size = new System.Drawing.Size(170, 24);
this.txt_wgTime.StyleController = this.layoutMx1;
this.txt_wgTime.TabIndex = 258;
//
- // txt_wgUser
+ // txt_kgTime
//
- this.txt_wgUser.Location = new System.Drawing.Point(927, 40);
- this.txt_wgUser.Name = "txt_wgUser";
- this.txt_wgUser.Properties.Appearance.Options.UseFont = true;
- this.txt_wgUser.Properties.ReadOnly = true;
- this.txt_wgUser.Size = new System.Drawing.Size(187, 24);
- this.txt_wgUser.StyleController = this.layoutMx1;
- this.txt_wgUser.TabIndex = 262;
+ this.txt_kgTime.Location = new System.Drawing.Point(944, 40);
+ this.txt_kgTime.Name = "txt_kgTime";
+ this.txt_kgTime.Properties.Appearance.Options.UseFont = true;
+ this.txt_kgTime.Properties.ReadOnly = true;
+ this.txt_kgTime.Size = new System.Drawing.Size(170, 24);
+ this.txt_kgTime.StyleController = this.layoutMx1;
+ this.txt_kgTime.TabIndex = 262;
//
// txt_daa014
//
- this.txt_daa014.Location = new System.Drawing.Point(375, 12);
+ this.txt_daa014.Location = new System.Drawing.Point(668, 12);
this.txt_daa014.Name = "txt_daa014";
this.txt_daa014.Properties.Appearance.Options.UseFont = true;
this.txt_daa014.Properties.ReadOnly = true;
- this.txt_daa014.Size = new System.Drawing.Size(185, 24);
+ this.txt_daa014.Size = new System.Drawing.Size(168, 24);
this.txt_daa014.StyleController = this.layoutMx1;
this.txt_daa014.TabIndex = 226;
//
// txt_daa018
//
- this.txt_daa018.Location = new System.Drawing.Point(927, 12);
+ this.txt_daa018.Location = new System.Drawing.Point(944, 12);
this.txt_daa018.Name = "txt_daa018";
this.txt_daa018.Properties.Appearance.Options.UseFont = true;
this.txt_daa018.Properties.ReadOnly = true;
- this.txt_daa018.Size = new System.Drawing.Size(187, 24);
+ this.txt_daa018.Size = new System.Drawing.Size(170, 24);
this.txt_daa018.StyleController = this.layoutMx1;
this.txt_daa018.TabIndex = 252;
//
// txt_blStateTxt
//
- this.txt_blStateTxt.Location = new System.Drawing.Point(651, 12);
+ this.txt_blStateTxt.Location = new System.Drawing.Point(668, 69);
this.txt_blStateTxt.Name = "txt_blStateTxt";
this.txt_blStateTxt.Properties.Appearance.Options.UseFont = true;
this.txt_blStateTxt.Properties.ReadOnly = true;
- this.txt_blStateTxt.Size = new System.Drawing.Size(185, 24);
+ this.txt_blStateTxt.Size = new System.Drawing.Size(168, 24);
this.txt_blStateTxt.StyleController = this.layoutMx1;
this.txt_blStateTxt.TabIndex = 240;
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(99, 40);
+ this.txt_itemNo.Location = new System.Drawing.Point(116, 40);
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
this.txt_itemNo.Properties.ReadOnly = true;
- this.txt_itemNo.Size = new System.Drawing.Size(185, 24);
+ this.txt_itemNo.Size = new System.Drawing.Size(168, 24);
this.txt_itemNo.StyleController = this.layoutMx1;
this.txt_itemNo.TabIndex = 217;
//
// txt_daa008
//
- this.txt_daa008.Location = new System.Drawing.Point(375, 40);
+ this.txt_daa008.Location = new System.Drawing.Point(392, 40);
this.txt_daa008.Name = "txt_daa008";
this.txt_daa008.Properties.Appearance.Options.UseFont = true;
this.txt_daa008.Properties.ReadOnly = true;
- this.txt_daa008.Size = new System.Drawing.Size(185, 24);
+ this.txt_daa008.Size = new System.Drawing.Size(168, 24);
this.txt_daa008.StyleController = this.layoutMx1;
this.txt_daa008.TabIndex = 219;
//
// txt_dwName
//
- this.txt_dwName.Location = new System.Drawing.Point(651, 40);
+ this.txt_dwName.Location = new System.Drawing.Point(668, 40);
this.txt_dwName.Name = "txt_dwName";
this.txt_dwName.Properties.Appearance.Options.UseFont = true;
this.txt_dwName.Properties.ReadOnly = true;
- this.txt_dwName.Size = new System.Drawing.Size(185, 24);
+ this.txt_dwName.Size = new System.Drawing.Size(168, 24);
this.txt_dwName.StyleController = this.layoutMx1;
this.txt_dwName.TabIndex = 222;
//
// txt_cgd
//
- this.txt_cgd.Location = new System.Drawing.Point(99, 69);
+ this.txt_cgd.Location = new System.Drawing.Point(116, 69);
this.txt_cgd.Name = "txt_cgd";
- this.txt_cgd.Size = new System.Drawing.Size(185, 24);
+ this.txt_cgd.Size = new System.Drawing.Size(168, 24);
this.txt_cgd.StyleController = this.layoutMx1;
this.txt_cgd.TabIndex = 313;
//
// txt_cgdxh
//
- this.txt_cgdxh.Location = new System.Drawing.Point(375, 69);
+ this.txt_cgdxh.Location = new System.Drawing.Point(392, 69);
this.txt_cgdxh.Name = "txt_cgdxh";
- this.txt_cgdxh.Size = new System.Drawing.Size(185, 24);
+ this.txt_cgdxh.Size = new System.Drawing.Size(168, 24);
this.txt_cgdxh.StyleController = this.layoutMx1;
this.txt_cgdxh.TabIndex = 314;
//
// txt_erpProductionOrderNo
//
- this.txt_erpProductionOrderNo.Location = new System.Drawing.Point(651, 69);
+ this.txt_erpProductionOrderNo.Location = new System.Drawing.Point(392, 12);
this.txt_erpProductionOrderNo.Name = "txt_erpProductionOrderNo";
- this.txt_erpProductionOrderNo.Size = new System.Drawing.Size(185, 24);
+ this.txt_erpProductionOrderNo.Size = new System.Drawing.Size(168, 24);
this.txt_erpProductionOrderNo.StyleController = this.layoutMx1;
this.txt_erpProductionOrderNo.TabIndex = 315;
//
@@ -726,18 +731,18 @@
this.Root.GroupBordersVisible = false;
this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem1,
- this.layoutControlItem2,
this.layoutControlItem5,
this.layoutControlItem6,
this.layoutControlItem17,
this.layoutControlItem3,
this.layoutControlItem7,
- this.layoutControlItem12,
this.layoutControlItem11,
this.layoutControlItem18,
this.layoutControlItem13,
+ this.layoutControlItem10,
+ this.layoutControlItem12,
this.layoutControlItem19,
- this.layoutControlItem10});
+ this.layoutControlItem2});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -777,17 +782,7 @@
this.layoutControlItem1.Name = "layoutControlItem1";
this.layoutControlItem1.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem1.Text = "濮斿宸ュ崟鍙�";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem2
- //
- this.layoutControlItem2.Control = this.txt_daa014;
- this.layoutControlItem2.Location = new System.Drawing.Point(276, 0);
- this.layoutControlItem2.Name = "layoutControlItem2";
- this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(276, 28);
- this.layoutControlItem2.Text = "濮斿璁㈠崟鍙�";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(92, 18);
//
// layoutControlItem5
//
@@ -797,7 +792,7 @@
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem5.Size = new System.Drawing.Size(276, 29);
this.layoutControlItem5.Text = "鐗╂枡缂栫爜";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(92, 18);
//
// layoutControlItem6
//
@@ -808,7 +803,7 @@
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem6.Size = new System.Drawing.Size(276, 29);
this.layoutControlItem6.Text = "宸ュ崟鏁伴噺";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(92, 18);
//
// layoutControlItem17
//
@@ -818,7 +813,7 @@
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
this.layoutControlItem17.Size = new System.Drawing.Size(276, 29);
this.layoutControlItem17.Text = "閲囪喘鍗曞彿";
- this.layoutControlItem17.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem17.TextSize = new System.Drawing.Size(92, 18);
//
// layoutControlItem3
//
@@ -828,28 +823,19 @@
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem3.Size = new System.Drawing.Size(278, 28);
this.layoutControlItem3.Text = "宸ュ崟鐘舵�� ";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(92, 18);
//
// layoutControlItem7
//
- this.layoutControlItem7.Control = this.txt_wgUser;
+ this.layoutControlItem7.Control = this.txt_kgTime;
+ this.layoutControlItem7.CustomizationFormText = "Mes寮�宸ユ椂闂�";
this.layoutControlItem7.Location = new System.Drawing.Point(828, 28);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem7.Size = new System.Drawing.Size(278, 29);
- this.layoutControlItem7.Text = "瀹屽伐浜哄憳";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem12
- //
- this.layoutControlItem12.Control = this.txt_blStateTxt;
- this.layoutControlItem12.Location = new System.Drawing.Point(552, 0);
- this.layoutControlItem12.Name = "layoutControlItem12";
- this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem12.Size = new System.Drawing.Size(276, 28);
- this.layoutControlItem12.Text = "閫氱煡澶囨枡";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem7.Text = "Mes寮�宸ユ椂闂�";
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(92, 18);
//
// layoutControlItem11
//
@@ -859,8 +845,8 @@
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
this.layoutControlItem11.Size = new System.Drawing.Size(278, 29);
- this.layoutControlItem11.Text = "瀹屽伐鏃堕棿 ";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem11.Text = "Mes瀹屽伐鏃堕棿 ";
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(92, 18);
//
// layoutControlItem18
//
@@ -871,7 +857,7 @@
this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 2;
this.layoutControlItem18.Size = new System.Drawing.Size(276, 29);
this.layoutControlItem18.Text = "閲囪喘鍗曡鍙�";
- this.layoutControlItem18.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem18.TextSize = new System.Drawing.Size(92, 18);
//
// layoutControlItem13
//
@@ -882,7 +868,49 @@
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
this.layoutControlItem13.Size = new System.Drawing.Size(552, 29);
this.layoutControlItem13.Text = "澶囨敞澶囨敞";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(92, 18);
+ //
+ // layoutControlItem10
+ //
+ this.layoutControlItem10.Control = this.txt_dwName;
+ this.layoutControlItem10.Location = new System.Drawing.Point(552, 28);
+ this.layoutControlItem10.Name = "layoutControlItem10";
+ this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem10.Size = new System.Drawing.Size(276, 29);
+ this.layoutControlItem10.Text = "鍗曚綅";
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(92, 18);
+ //
+ // layoutControlItem12
+ //
+ this.layoutControlItem12.Control = this.txt_blStateTxt;
+ this.layoutControlItem12.Location = new System.Drawing.Point(552, 57);
+ this.layoutControlItem12.Name = "layoutControlItem12";
+ this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem12.Size = new System.Drawing.Size(276, 29);
+ this.layoutControlItem12.Text = "閫氱煡澶囨枡";
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(92, 18);
+ //
+ // layoutControlItem19
+ //
+ this.layoutControlItem19.Control = this.txt_erpProductionOrderNo;
+ this.layoutControlItem19.Location = new System.Drawing.Point(276, 0);
+ this.layoutControlItem19.Name = "layoutControlItem19";
+ this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem19.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem19.Text = "浠诲姟鍗曞彿";
+ this.layoutControlItem19.TextSize = new System.Drawing.Size(92, 18);
+ //
+ // layoutControlItem2
+ //
+ this.layoutControlItem2.Control = this.txt_daa014;
+ this.layoutControlItem2.Location = new System.Drawing.Point(552, 0);
+ this.layoutControlItem2.Name = "layoutControlItem2";
+ this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem2.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem2.Text = "濮斿璁㈠崟鍙�";
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(92, 18);
//
// tabMx
//
@@ -931,11 +959,16 @@
this.gvMx1dab007,
this.gvMx1dab021,
this.gvMx1dab009,
- this.gvMx1dab017,
- this.gvMx1dab018,
this.gvMx1dab001,
this.gvMx1dab012,
- this.gvMx1dab002});
+ this.gvMx1dab002,
+ this.gridColumn7,
+ this.gridColumn14,
+ this.gridColumn15,
+ this.gridColumn16,
+ this.gridColumn17,
+ this.gridColumn18,
+ this.gridColumn19});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -989,7 +1022,7 @@
this.gridColumn6.MinWidth = 25;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 0;
+ this.gridColumn6.VisibleIndex = 1;
this.gridColumn6.Width = 94;
//
// gridColumn5
@@ -999,7 +1032,7 @@
this.gridColumn5.MinWidth = 25;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 1;
+ this.gridColumn5.VisibleIndex = 2;
this.gridColumn5.Width = 94;
//
// gridColumn4
@@ -1009,7 +1042,7 @@
this.gridColumn4.MinWidth = 25;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 2;
+ this.gridColumn4.VisibleIndex = 3;
this.gridColumn4.Width = 94;
//
// gvMx1dab006
@@ -1021,7 +1054,7 @@
this.gvMx1dab006.Name = "gvMx1dab006";
this.gvMx1dab006.Tag = "query_a.dab006";
this.gvMx1dab006.Visible = true;
- this.gvMx1dab006.VisibleIndex = 3;
+ this.gvMx1dab006.VisibleIndex = 5;
this.gvMx1dab006.Width = 50;
//
// gvMx1dab007
@@ -1033,7 +1066,7 @@
this.gvMx1dab007.Name = "gvMx1dab007";
this.gvMx1dab007.Tag = "query_a.dab007";
this.gvMx1dab007.Visible = true;
- this.gvMx1dab007.VisibleIndex = 4;
+ this.gvMx1dab007.VisibleIndex = 6;
this.gvMx1dab007.Width = 50;
//
// gvMx1dab021
@@ -1045,7 +1078,7 @@
this.gvMx1dab021.Name = "gvMx1dab021";
this.gvMx1dab021.Tag = "query_a.dab021";
this.gvMx1dab021.Visible = true;
- this.gvMx1dab021.VisibleIndex = 5;
+ this.gvMx1dab021.VisibleIndex = 7;
this.gvMx1dab021.Width = 50;
//
// gvMx1dab009
@@ -1057,28 +1090,8 @@
this.gvMx1dab009.Name = "gvMx1dab009";
this.gvMx1dab009.Tag = "query_a.dab009";
this.gvMx1dab009.Visible = true;
- this.gvMx1dab009.VisibleIndex = 6;
+ this.gvMx1dab009.VisibleIndex = 8;
this.gvMx1dab009.Width = 50;
- //
- // gvMx1dab017
- //
- this.gvMx1dab017.AppearanceCell.Options.UseFont = true;
- this.gvMx1dab017.Caption = "浠撳簱Id";
- this.gvMx1dab017.FieldName = "dab017";
- this.gvMx1dab017.MinWidth = 50;
- this.gvMx1dab017.Name = "gvMx1dab017";
- this.gvMx1dab017.Tag = "query_a.dab017";
- this.gvMx1dab017.Width = 94;
- //
- // gvMx1dab018
- //
- this.gvMx1dab018.AppearanceCell.Options.UseFont = true;
- this.gvMx1dab018.Caption = "浠撳簱鍚嶇О ";
- this.gvMx1dab018.FieldName = "dab018";
- this.gvMx1dab018.MinWidth = 50;
- this.gvMx1dab018.Name = "gvMx1dab018";
- this.gvMx1dab018.Tag = "query_a.dab018";
- this.gvMx1dab018.Width = 94;
//
// gvMx1dab001
//
@@ -1089,7 +1102,7 @@
this.gvMx1dab001.Name = "gvMx1dab001";
this.gvMx1dab001.Tag = "query_a.dab001";
this.gvMx1dab001.Visible = true;
- this.gvMx1dab001.VisibleIndex = 7;
+ this.gvMx1dab001.VisibleIndex = 9;
this.gvMx1dab001.Width = 94;
//
// gvMx1dab012
@@ -1101,7 +1114,7 @@
this.gvMx1dab012.Name = "gvMx1dab012";
this.gvMx1dab012.Tag = "query_a.dab012";
this.gvMx1dab012.Visible = true;
- this.gvMx1dab012.VisibleIndex = 8;
+ this.gvMx1dab012.VisibleIndex = 10;
this.gvMx1dab012.Width = 50;
//
// gvMx1dab002
@@ -1113,30 +1126,86 @@
this.gvMx1dab002.Name = "gvMx1dab002";
this.gvMx1dab002.Tag = "query_a.dab002";
this.gvMx1dab002.Visible = true;
- this.gvMx1dab002.VisibleIndex = 9;
+ this.gvMx1dab002.VisibleIndex = 0;
this.gvMx1dab002.Width = 50;
//
- // layoutControlItem19
+ // gridColumn7
//
- this.layoutControlItem19.Control = this.txt_erpProductionOrderNo;
- this.layoutControlItem19.Location = new System.Drawing.Point(552, 57);
- this.layoutControlItem19.Name = "layoutControlItem19";
- this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem19.Size = new System.Drawing.Size(276, 29);
- this.layoutControlItem19.Text = "浠诲姟鍗曞彿";
- this.layoutControlItem19.TextSize = new System.Drawing.Size(75, 18);
+ this.gridColumn7.Caption = "琛ユ枡鏁伴噺";
+ this.gridColumn7.FieldName = "blQty";
+ this.gridColumn7.MinWidth = 25;
+ this.gridColumn7.Name = "gridColumn7";
+ this.gridColumn7.Visible = true;
+ this.gridColumn7.VisibleIndex = 11;
+ this.gridColumn7.Width = 94;
//
- // layoutControlItem10
+ // gridColumn14
//
- this.layoutControlItem10.Control = this.txt_dwName;
- this.layoutControlItem10.Location = new System.Drawing.Point(552, 28);
- this.layoutControlItem10.Name = "layoutControlItem10";
- this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem10.Size = new System.Drawing.Size(276, 29);
- this.layoutControlItem10.Text = "鍗曚綅";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(75, 18);
+ this.gridColumn14.Caption = "瓒呴鏁伴噺";
+ this.gridColumn14.FieldName = "clQty";
+ this.gridColumn14.MinWidth = 25;
+ this.gridColumn14.Name = "gridColumn14";
+ this.gridColumn14.Visible = true;
+ this.gridColumn14.VisibleIndex = 12;
+ this.gridColumn14.Width = 94;
+ //
+ // gridColumn15
+ //
+ this.gridColumn15.Caption = "鏉ユ枡涓嶈壇閫�鏂�";
+ this.gridColumn15.FieldName = "llBl";
+ this.gridColumn15.MinWidth = 25;
+ this.gridColumn15.Name = "gridColumn15";
+ this.gridColumn15.Visible = true;
+ this.gridColumn15.VisibleIndex = 13;
+ this.gridColumn15.Width = 94;
+ //
+ // gridColumn16
+ //
+ this.gridColumn16.Caption = "鑹搧閫�鏂�";
+ this.gridColumn16.FieldName = "lpTl";
+ this.gridColumn16.MinWidth = 25;
+ this.gridColumn16.Name = "gridColumn16";
+ this.gridColumn16.Visible = true;
+ this.gridColumn16.VisibleIndex = 14;
+ this.gridColumn16.Width = 94;
+ //
+ // gridColumn17
+ //
+ this.gridColumn17.Caption = "浣滀笟涓嶈壇閫�鏂�";
+ this.gridColumn17.FieldName = "zyBl";
+ this.gridColumn17.MinWidth = 25;
+ this.gridColumn17.Name = "gridColumn17";
+ this.gridColumn17.Visible = true;
+ this.gridColumn17.VisibleIndex = 15;
+ this.gridColumn17.Width = 94;
+ //
+ // gridColumn18
+ //
+ this.gridColumn18.Caption = "閫�鏂欐�绘暟";
+ this.gridColumn18.FieldName = "ztsl";
+ this.gridColumn18.MinWidth = 25;
+ this.gridColumn18.Name = "gridColumn18";
+ this.gridColumn18.Width = 94;
+ //
+ // gridColumn19
+ //
+ this.gridColumn19.Caption = "棰嗘枡杩涘害";
+ this.gridColumn19.FieldName = "barbl";
+ this.gridColumn19.MinWidth = 25;
+ this.gridColumn19.Name = "gridColumn19";
+ this.gridColumn19.Visible = true;
+ this.gridColumn19.VisibleIndex = 4;
+ this.gridColumn19.Width = 94;
+ //
+ // gridColumn20
+ //
+ this.gridColumn20.Caption = "鍏ュ簱璐т富";
+ this.gridColumn20.FieldName = "stockownerName";
+ this.gridColumn20.MinWidth = 25;
+ this.gridColumn20.Name = "gridColumn20";
+ this.gridColumn20.Visible = true;
+ this.gridColumn20.VisibleIndex = 13;
+ this.gridColumn20.Width = 94;
//
// Frm_WwGd
//
@@ -1169,7 +1238,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa001.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_wgTime.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_wgUser.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_kgTime.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa014.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa018.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_blStateTxt.Properties)).EndInit();
@@ -1182,23 +1251,23 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
this.ResumeLayout(false);
}
@@ -1229,7 +1298,7 @@
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private System.Windows.Forms.Label lbGuid;
private DevExpress.XtraEditors.TextEdit txt_remark;
- private DevExpress.XtraEditors.TextEdit txt_wgUser;
+ private DevExpress.XtraEditors.TextEdit txt_kgTime;
private DevExpress.XtraEditors.TextEdit txt_wgTime;
private DevExpress.XtraEditors.TextEdit txt_daa018;
private DevExpress.XtraEditors.TextEdit txt_blStateTxt;
@@ -1241,7 +1310,6 @@
private DevExpress.XtraLayout.LayoutControl layoutMx1;
private DevExpress.XtraLayout.LayoutControlGroup Root;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
@@ -1260,8 +1328,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gvMx1dab007;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1dab009;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1dab021;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1dab017;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1dab018;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1dab001;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1dab012;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1dab002;
@@ -1278,11 +1344,20 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
}
}
\ No newline at end of file
--
Gitblit v1.9.3