From 8daa94248baa30f5606c9486b0c1c5603f9de8b4 Mon Sep 17 00:00:00 2001
From: cnf <3283105747@qq.com>
Date: 星期四, 11 十二月 2025 20:45:39 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~cnf/JH/JH_MesCilent
---
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs | 99 +++++++++++++++++++++++++------------------------
1 files changed, 50 insertions(+), 49 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs
index 1af8821..da56e35 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs
@@ -277,13 +277,14 @@
this.gv_wgTime,
this.gv_wgUser,
this.gv_remark,
- this.gridColumn21,
this.gridColumn8,
this.gridColumn9,
this.gridColumn10,
this.gridColumn11,
this.gridColumn12,
- this.gridColumn20});
+ this.gridColumn20,
+ this.gridColumn21});
+ this.gridView1.CustomizationFormBounds = new System.Drawing.Rectangle(1164, 232, 264, 432);
this.gridView1.DetailHeight = 272;
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 44;
@@ -618,7 +619,7 @@
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(396, 20);
+ this.txt_remark.Size = new System.Drawing.Size(387, 20);
this.txt_remark.StyleController = this.layoutMx1;
this.txt_remark.TabIndex = 312;
//
@@ -629,62 +630,62 @@
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(154, 20);
+ this.txt_daa001.Size = new System.Drawing.Size(150, 20);
this.txt_daa001.StyleController = this.layoutMx1;
this.txt_daa001.TabIndex = 216;
//
// txt_wgTime
//
- this.txt_wgTime.Location = new System.Drawing.Point(819, 58);
+ this.txt_wgTime.Location = new System.Drawing.Point(805, 58);
this.txt_wgTime.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
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(155, 20);
+ this.txt_wgTime.Size = new System.Drawing.Size(152, 20);
this.txt_wgTime.StyleController = this.layoutMx1;
this.txt_wgTime.TabIndex = 258;
//
// txt_kgTime
//
- this.txt_kgTime.Location = new System.Drawing.Point(819, 34);
+ this.txt_kgTime.Location = new System.Drawing.Point(805, 34);
this.txt_kgTime.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
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(155, 20);
+ this.txt_kgTime.Size = new System.Drawing.Size(152, 20);
this.txt_kgTime.StyleController = this.layoutMx1;
this.txt_kgTime.TabIndex = 262;
//
// txt_daa014
//
- this.txt_daa014.Location = new System.Drawing.Point(577, 10);
+ this.txt_daa014.Location = new System.Drawing.Point(568, 10);
this.txt_daa014.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
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(155, 20);
+ this.txt_daa014.Size = new System.Drawing.Size(150, 20);
this.txt_daa014.StyleController = this.layoutMx1;
this.txt_daa014.TabIndex = 226;
//
// txt_daa018
//
- this.txt_daa018.Location = new System.Drawing.Point(819, 10);
+ this.txt_daa018.Location = new System.Drawing.Point(805, 10);
this.txt_daa018.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
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(155, 20);
+ this.txt_daa018.Size = new System.Drawing.Size(152, 20);
this.txt_daa018.StyleController = this.layoutMx1;
this.txt_daa018.TabIndex = 252;
//
// txt_blStateTxt
//
- this.txt_blStateTxt.Location = new System.Drawing.Point(577, 58);
+ this.txt_blStateTxt.Location = new System.Drawing.Point(568, 58);
this.txt_blStateTxt.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
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(155, 20);
+ this.txt_blStateTxt.Size = new System.Drawing.Size(150, 20);
this.txt_blStateTxt.StyleController = this.layoutMx1;
this.txt_blStateTxt.TabIndex = 240;
//
@@ -695,29 +696,29 @@
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(154, 20);
+ this.txt_itemNo.Size = new System.Drawing.Size(150, 20);
this.txt_itemNo.StyleController = this.layoutMx1;
this.txt_itemNo.TabIndex = 217;
//
// txt_daa008
//
- this.txt_daa008.Location = new System.Drawing.Point(335, 34);
+ this.txt_daa008.Location = new System.Drawing.Point(331, 34);
this.txt_daa008.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
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(155, 20);
+ this.txt_daa008.Size = new System.Drawing.Size(150, 20);
this.txt_daa008.StyleController = this.layoutMx1;
this.txt_daa008.TabIndex = 219;
//
// txt_dwName
//
- this.txt_dwName.Location = new System.Drawing.Point(577, 34);
+ this.txt_dwName.Location = new System.Drawing.Point(568, 34);
this.txt_dwName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
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(155, 20);
+ this.txt_dwName.Size = new System.Drawing.Size(150, 20);
this.txt_dwName.StyleController = this.layoutMx1;
this.txt_dwName.TabIndex = 222;
//
@@ -726,25 +727,25 @@
this.txt_cgd.Location = new System.Drawing.Point(94, 58);
this.txt_cgd.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_cgd.Name = "txt_cgd";
- this.txt_cgd.Size = new System.Drawing.Size(154, 20);
+ this.txt_cgd.Size = new System.Drawing.Size(150, 20);
this.txt_cgd.StyleController = this.layoutMx1;
this.txt_cgd.TabIndex = 313;
//
// txt_cgdxh
//
- this.txt_cgdxh.Location = new System.Drawing.Point(335, 58);
+ this.txt_cgdxh.Location = new System.Drawing.Point(331, 58);
this.txt_cgdxh.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_cgdxh.Name = "txt_cgdxh";
- this.txt_cgdxh.Size = new System.Drawing.Size(155, 20);
+ this.txt_cgdxh.Size = new System.Drawing.Size(150, 20);
this.txt_cgdxh.StyleController = this.layoutMx1;
this.txt_cgdxh.TabIndex = 314;
//
// txt_erpProductionOrderNo
//
- this.txt_erpProductionOrderNo.Location = new System.Drawing.Point(335, 10);
+ this.txt_erpProductionOrderNo.Location = new System.Drawing.Point(331, 10);
this.txt_erpProductionOrderNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_erpProductionOrderNo.Name = "txt_erpProductionOrderNo";
- this.txt_erpProductionOrderNo.Size = new System.Drawing.Size(155, 20);
+ this.txt_erpProductionOrderNo.Size = new System.Drawing.Size(150, 20);
this.txt_erpProductionOrderNo.StyleController = this.layoutMx1;
this.txt_erpProductionOrderNo.TabIndex = 315;
//
@@ -806,7 +807,7 @@
rowDefinition2,
rowDefinition3,
rowDefinition4});
- this.Root.Size = new System.Drawing.Size(985, 112);
+ this.Root.Size = new System.Drawing.Size(968, 112);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -815,7 +816,7 @@
this.layoutControlItem1.CustomizationFormText = "濮斿宸ュ崟鍙�";
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(241, 24);
+ this.layoutControlItem1.Size = new System.Drawing.Size(237, 24);
this.layoutControlItem1.Text = "濮斿宸ュ崟鍙�";
this.layoutControlItem1.TextSize = new System.Drawing.Size(73, 14);
//
@@ -825,18 +826,18 @@
this.layoutControlItem5.Location = new System.Drawing.Point(0, 24);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(241, 24);
+ this.layoutControlItem5.Size = new System.Drawing.Size(237, 24);
this.layoutControlItem5.Text = "鐗╂枡缂栫爜";
this.layoutControlItem5.TextSize = new System.Drawing.Size(73, 14);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_daa008;
- this.layoutControlItem6.Location = new System.Drawing.Point(241, 24);
+ this.layoutControlItem6.Location = new System.Drawing.Point(237, 24);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(242, 24);
+ this.layoutControlItem6.Size = new System.Drawing.Size(237, 24);
this.layoutControlItem6.Text = "宸ュ崟鏁伴噺";
this.layoutControlItem6.TextSize = new System.Drawing.Size(73, 14);
//
@@ -846,17 +847,17 @@
this.layoutControlItem17.Location = new System.Drawing.Point(0, 48);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem17.Size = new System.Drawing.Size(241, 24);
+ this.layoutControlItem17.Size = new System.Drawing.Size(237, 24);
this.layoutControlItem17.Text = "閲囪喘鍗曞彿";
this.layoutControlItem17.TextSize = new System.Drawing.Size(73, 14);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_daa018;
- this.layoutControlItem3.Location = new System.Drawing.Point(725, 0);
+ this.layoutControlItem3.Location = new System.Drawing.Point(711, 0);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem3.Size = new System.Drawing.Size(242, 24);
+ this.layoutControlItem3.Size = new System.Drawing.Size(239, 24);
this.layoutControlItem3.Text = "宸ュ崟鐘舵�� ";
this.layoutControlItem3.TextSize = new System.Drawing.Size(73, 14);
//
@@ -864,33 +865,33 @@
//
this.layoutControlItem7.Control = this.txt_kgTime;
this.layoutControlItem7.CustomizationFormText = "Mes寮�宸ユ椂闂�";
- this.layoutControlItem7.Location = new System.Drawing.Point(725, 24);
+ this.layoutControlItem7.Location = new System.Drawing.Point(711, 24);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem7.Size = new System.Drawing.Size(242, 24);
+ this.layoutControlItem7.Size = new System.Drawing.Size(239, 24);
this.layoutControlItem7.Text = "Mes寮�宸ユ椂闂�";
this.layoutControlItem7.TextSize = new System.Drawing.Size(73, 14);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_wgTime;
- this.layoutControlItem11.Location = new System.Drawing.Point(725, 48);
+ this.layoutControlItem11.Location = new System.Drawing.Point(711, 48);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(242, 24);
+ this.layoutControlItem11.Size = new System.Drawing.Size(239, 24);
this.layoutControlItem11.Text = "Mes瀹屽伐鏃堕棿 ";
this.layoutControlItem11.TextSize = new System.Drawing.Size(73, 14);
//
// layoutControlItem18
//
this.layoutControlItem18.Control = this.txt_cgdxh;
- this.layoutControlItem18.Location = new System.Drawing.Point(241, 48);
+ this.layoutControlItem18.Location = new System.Drawing.Point(237, 48);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem18.Size = new System.Drawing.Size(242, 24);
+ this.layoutControlItem18.Size = new System.Drawing.Size(237, 24);
this.layoutControlItem18.Text = "閲囪喘鍗曡鍙�";
this.layoutControlItem18.TextSize = new System.Drawing.Size(73, 14);
//
@@ -901,49 +902,49 @@
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem13.Size = new System.Drawing.Size(483, 24);
+ this.layoutControlItem13.Size = new System.Drawing.Size(474, 24);
this.layoutControlItem13.Text = "澶囨敞澶囨敞";
this.layoutControlItem13.TextSize = new System.Drawing.Size(73, 14);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_dwName;
- this.layoutControlItem10.Location = new System.Drawing.Point(483, 24);
+ this.layoutControlItem10.Location = new System.Drawing.Point(474, 24);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem10.Size = new System.Drawing.Size(242, 24);
+ this.layoutControlItem10.Size = new System.Drawing.Size(237, 24);
this.layoutControlItem10.Text = "鍗曚綅";
this.layoutControlItem10.TextSize = new System.Drawing.Size(73, 14);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_blStateTxt;
- this.layoutControlItem12.Location = new System.Drawing.Point(483, 48);
+ this.layoutControlItem12.Location = new System.Drawing.Point(474, 48);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem12.Size = new System.Drawing.Size(242, 24);
+ this.layoutControlItem12.Size = new System.Drawing.Size(237, 24);
this.layoutControlItem12.Text = "閫氱煡澶囨枡";
this.layoutControlItem12.TextSize = new System.Drawing.Size(73, 14);
//
// layoutControlItem19
//
this.layoutControlItem19.Control = this.txt_erpProductionOrderNo;
- this.layoutControlItem19.Location = new System.Drawing.Point(241, 0);
+ this.layoutControlItem19.Location = new System.Drawing.Point(237, 0);
this.layoutControlItem19.Name = "layoutControlItem19";
this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem19.Size = new System.Drawing.Size(242, 24);
+ this.layoutControlItem19.Size = new System.Drawing.Size(237, 24);
this.layoutControlItem19.Text = "浠诲姟鍗曞彿";
this.layoutControlItem19.TextSize = new System.Drawing.Size(73, 14);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_daa014;
- this.layoutControlItem2.Location = new System.Drawing.Point(483, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(474, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem2.Size = new System.Drawing.Size(242, 24);
+ this.layoutControlItem2.Size = new System.Drawing.Size(237, 24);
this.layoutControlItem2.Text = "濮斿璁㈠崟鍙�";
this.layoutControlItem2.TextSize = new System.Drawing.Size(73, 14);
//
@@ -1239,8 +1240,8 @@
//
// gridColumn21
//
- this.gridColumn21.Caption = "渚涘簲鍟�";
- this.gridColumn21.FieldName = "gys";
+ this.gridColumn21.Caption = "闇�姹傚崟鎹彿";
+ this.gridColumn21.FieldName = "xqdj";
this.gridColumn21.Name = "gridColumn21";
this.gridColumn21.Visible = true;
this.gridColumn21.VisibleIndex = 14;
--
Gitblit v1.9.3