From 82572cfe57091972a99dff319e5df5ee516ee096 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期六, 13 九月 2025 16:20:28 +0800
Subject: [PATCH] 增加字段
---
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs | 126 +++++++++++++++++++++++++++++++++--------
1 files changed, 100 insertions(+), 26 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
index 24021d6..616028c 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
@@ -95,6 +95,7 @@
this.txt_guid = new DevExpress.XtraEditors.TextEdit();
this.txt_paperBillNo = new DevExpress.XtraEditors.TextEdit();
this.txt_isSrm = new DevExpress.XtraEditors.CheckEdit();
+ this.txt_mxStatue = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
@@ -111,6 +112,8 @@
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem10 = 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();
@@ -161,10 +164,17 @@
this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+<<<<<<< Updated upstream
this.txt_mxStatue = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
>>>>>>> 32e0a92a0c603db872d56739299cb7f603b23dd1
+=======
+ this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn();
+>>>>>>> Stashed changes
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -196,6 +206,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_isSrm.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_mxStatue.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
@@ -212,6 +223,8 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -222,9 +235,6 @@
((System.ComponentModel.ISupportInitialize)(this.rptHistory)).BeginInit();
this.xtraTabPageReport.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_mxStatue.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -324,7 +334,11 @@
this.gridColumn4,
this.gridColumn11,
this.gridColumn7,
- this.gridColumn22});
+ this.gridColumn22,
+ this.gridColumn23,
+ this.gridColumn24,
+ this.gridColumn25,
+ this.gridColumn26});
this.gridView1.DetailHeight = 428;
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 62;
@@ -774,6 +788,16 @@
this.txt_isSrm.TabIndex = 468;
this.txt_isSrm.Tag = "readOnly";
//
+ // txt_mxStatue
+ //
+ this.txt_mxStatue.Location = new System.Drawing.Point(600, 132);
+ this.txt_mxStatue.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_mxStatue.Name = "txt_mxStatue";
+ this.txt_mxStatue.Properties.Appearance.Options.UseFont = true;
+ this.txt_mxStatue.Size = new System.Drawing.Size(381, 28);
+ this.txt_mxStatue.StyleController = this.layoutMx1;
+ this.txt_mxStatue.TabIndex = 240;
+ //
// layoutControlItem18
//
this.layoutControlItem18.Control = this.lbGuid;
@@ -990,6 +1014,28 @@
this.layoutControlItem6.Size = new System.Drawing.Size(487, 42);
this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem6.TextVisible = false;
+ //
+ // layoutControlItem10
+ //
+ this.layoutControlItem10.Control = this.txt_mxStatue;
+ this.layoutControlItem10.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem10.CustomizationFormText = "鍏ュ簱鐘舵��";
+ this.layoutControlItem10.Location = new System.Drawing.Point(486, 120);
+ this.layoutControlItem10.Name = "layoutControlItem10";
+ this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem10.Size = new System.Drawing.Size(487, 42);
+ this.layoutControlItem10.Text = "鍏ュ簱鐘舵��";
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 22);
+ //
+ // layoutControlItem2
+ //
+ this.layoutControlItem2.Control = this.txt_billNo;
+ this.layoutControlItem2.Location = new System.Drawing.Point(0, 0);
+ this.layoutControlItem2.Name = "layoutControlItem2";
+ this.layoutControlItem2.Size = new System.Drawing.Size(486, 40);
+ this.layoutControlItem2.Text = "鍒拌揣鍗曞彿";
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 22);
//
// tabMx
//
@@ -1518,6 +1564,7 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
+<<<<<<< Updated upstream
<<<<<<< HEAD
// ucRptCgdhd1
//
@@ -1528,30 +1575,31 @@
this.ucRptCgdhd1.TabIndex = 0;
=======
// txt_mxStatue
+=======
+ // gridColumn23
+>>>>>>> Stashed changes
//
- this.txt_mxStatue.Location = new System.Drawing.Point(600, 132);
- this.txt_mxStatue.Margin = new System.Windows.Forms.Padding(4);
- this.txt_mxStatue.Name = "txt_mxStatue";
- this.txt_mxStatue.Properties.Appearance.Options.UseFont = true;
- this.txt_mxStatue.Size = new System.Drawing.Size(381, 28);
- this.txt_mxStatue.StyleController = this.layoutMx1;
- this.txt_mxStatue.TabIndex = 240;
+ this.gridColumn23.Caption = "鍒拌揣鏁伴噺";
+ this.gridColumn23.FieldName = "鍒拌揣鏁伴噺";
+ this.gridColumn23.MinWidth = 30;
+ this.gridColumn23.Name = "gridColumn23";
+ this.gridColumn23.Visible = true;
+ this.gridColumn23.VisibleIndex = 15;
+ this.gridColumn23.Width = 112;
//
- // layoutControlItem10
+ // gridColumn24
//
- this.layoutControlItem10.Control = this.txt_mxStatue;
- this.layoutControlItem10.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
- this.layoutControlItem10.CustomizationFormText = "鍏ュ簱鐘舵��";
- this.layoutControlItem10.Location = new System.Drawing.Point(486, 120);
- this.layoutControlItem10.Name = "layoutControlItem10";
- this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem10.Size = new System.Drawing.Size(487, 42);
- this.layoutControlItem10.Text = "鍏ュ簱鐘舵��";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 22);
+ this.gridColumn24.Caption = "妫�楠屾暟閲�";
+ this.gridColumn24.FieldName = "妫�楠屾暟閲�";
+ this.gridColumn24.MinWidth = 30;
+ this.gridColumn24.Name = "gridColumn24";
+ this.gridColumn24.Visible = true;
+ this.gridColumn24.VisibleIndex = 16;
+ this.gridColumn24.Width = 112;
//
- // layoutControlItem2
+ // gridColumn25
//
+<<<<<<< Updated upstream
this.layoutControlItem2.Control = this.txt_billNo;
this.layoutControlItem2.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
@@ -1559,6 +1607,25 @@
this.layoutControlItem2.Text = "鍒拌揣鍗曞彿";
this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 22);
>>>>>>> 32e0a92a0c603db872d56739299cb7f603b23dd1
+=======
+ this.gridColumn25.Caption = "鍏ュ簱鏁伴噺";
+ this.gridColumn25.FieldName = "鍏ュ簱鏁伴噺";
+ this.gridColumn25.MinWidth = 30;
+ this.gridColumn25.Name = "gridColumn25";
+ this.gridColumn25.Visible = true;
+ this.gridColumn25.VisibleIndex = 17;
+ this.gridColumn25.Width = 112;
+ //
+ // gridColumn26
+ //
+ this.gridColumn26.Caption = "鎵撳嵃鏁伴噺";
+ this.gridColumn26.FieldName = "鎵撳嵃鏁伴噺";
+ this.gridColumn26.MinWidth = 30;
+ this.gridColumn26.Name = "gridColumn26";
+ this.gridColumn26.Visible = true;
+ this.gridColumn26.VisibleIndex = 18;
+ this.gridColumn26.Width = 112;
+>>>>>>> Stashed changes
//
// Frm_MesInvItemArn
//
@@ -1602,6 +1669,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_isSrm.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_mxStatue.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
@@ -1618,6 +1686,8 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1628,9 +1698,6 @@
((System.ComponentModel.ISupportInitialize)(this.rptHistory)).EndInit();
this.xtraTabPageReport.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_mxStatue.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
this.ResumeLayout(false);
}
@@ -1744,6 +1811,13 @@
private DevExpress.XtraEditors.TextEdit txt_mxStatue;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+<<<<<<< Updated upstream
>>>>>>> 32e0a92a0c603db872d56739299cb7f603b23dd1
+=======
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn24;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn25;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn26;
+>>>>>>> Stashed changes
}
}
\ No newline at end of file
--
Gitblit v1.9.3