From c2e1de823e648ca7e62bc868d8aaf9ad5c65a287 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期日, 14 九月 2025 09:17:28 +0800
Subject: [PATCH] 到货单版本冲突
---
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs | 33 ++++++++++++++++++++++++++++++++-
1 files changed, 32 insertions(+), 1 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
index 1703f53..3a9be81 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
@@ -79,6 +79,7 @@
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+ this.txt_wwgys = new Gs.DevApp.UserControl.UcLookSupplier();
this.btnCopyXls = new DevExpress.XtraEditors.SimpleButton();
this.lbGuid = new System.Windows.Forms.Label();
this.ucLookHuoZhu1 = new Gs.DevApp.UserControl.UcLookHuoZhu();
@@ -130,6 +131,7 @@
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layItemWwgys = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -225,6 +227,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layItemWwgys)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -581,6 +584,7 @@
//
// layoutMx1
//
+ this.layoutMx1.Controls.Add(this.txt_wwgys);
this.layoutMx1.Controls.Add(this.btnCopyXls);
this.layoutMx1.Controls.Add(this.lbGuid);
this.layoutMx1.Controls.Add(this.ucLookHuoZhu1);
@@ -616,6 +620,15 @@
this.layoutMx1.Size = new System.Drawing.Size(1126, 233);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
+ //
+ // txt_wwgys
+ //
+ this.txt_wwgys.IsReadly = false;
+ this.txt_wwgys.Location = new System.Drawing.Point(385, 198);
+ this.txt_wwgys.Margin = new System.Windows.Forms.Padding(0);
+ this.txt_wwgys.Name = "txt_wwgys";
+ this.txt_wwgys.Size = new System.Drawing.Size(165, 24);
+ this.txt_wwgys.TabIndex = 446;
//
// btnCopyXls
//
@@ -916,7 +929,8 @@
this.layoutControlItem24,
this.layoutControlItem12,
this.layoutControlItem1,
- this.layoutControlItem25});
+ this.layoutControlItem25,
+ this.layItemWwgys});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -1220,6 +1234,20 @@
this.layoutControlItem25.Text = "蹇嵎褰曞叆";
this.layoutControlItem25.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem25.TextVisible = false;
+ //
+ // layItemWwgys
+ //
+ this.layItemWwgys.AppearanceItemCaption.ForeColor = System.Drawing.Color.Blue;
+ this.layItemWwgys.AppearanceItemCaption.Options.UseForeColor = true;
+ this.layItemWwgys.Control = this.txt_wwgys;
+ this.layItemWwgys.Location = new System.Drawing.Point(271, 186);
+ this.layItemWwgys.Name = "layItemWwgys";
+ this.layItemWwgys.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layItemWwgys.OptionsTableLayoutItem.RowIndex = 6;
+ this.layItemWwgys.Size = new System.Drawing.Size(271, 31);
+ this.layItemWwgys.Text = "濮斿渚涘簲鍟�";
+ this.layItemWwgys.TextSize = new System.Drawing.Size(90, 18);
+ this.layItemWwgys.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
//
// tabMx
//
@@ -1663,6 +1691,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layItemWwgys)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1787,5 +1816,7 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
+ private UserControl.UcLookSupplier txt_wwgys;
+ private DevExpress.XtraLayout.LayoutControlItem layItemWwgys;
}
}
\ No newline at end of file
--
Gitblit v1.9.3