From bf38a1efd44341141174623acf44d0c22535c28b Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 26 十月 2024 15:56:51 +0800
Subject: [PATCH] 111
---
DevApp/Gs.DevApp/TestForm/XtraForm1.cs | 8 +++
DevApp/Gs.DevApp/UserControl/UcLookItems.cs | 6 +++
DevApp/Gs.DevApp/UserControl/UcLookItems.Designer.cs | 6 +++
DevApp/Gs.DevApp/Gs.DevApp.csproj | 18 +++++++++
DevApp/Gs.DevApp/TestForm/XtraForm1.Designer.cs | 35 +++++++++++++++--
5 files changed, 67 insertions(+), 6 deletions(-)
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index c6ef554..1126299 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -373,6 +373,12 @@
<Compile Include="UserControl\SelectCgMx.Designer.cs">
<DependentUpon>SelectCgMx.cs</DependentUpon>
</Compile>
+ <Compile Include="UserControl\SelectCheckDt.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="UserControl\SelectCheckDt.Designer.cs">
+ <DependentUpon>SelectCheckDt.cs</DependentUpon>
+ </Compile>
<Compile Include="UserControl\ShowRptWizard.cs">
<SubType>Form</SubType>
</Compile>
@@ -390,6 +396,12 @@
</Compile>
<Compile Include="UserControl\UcLookCk.Designer.cs">
<DependentUpon>UcLookCk.cs</DependentUpon>
+ </Compile>
+ <Compile Include="UserControl\UcLookItems.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="UserControl\UcLookItems.Designer.cs">
+ <DependentUpon>UcLookItems.cs</DependentUpon>
</Compile>
<Compile Include="UserControl\UcLookSupplier.cs">
<SubType>UserControl</SubType>
@@ -521,6 +533,9 @@
<EmbeddedResource Include="UserControl\SelectCgMx.resx">
<DependentUpon>SelectCgMx.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="UserControl\SelectCheckDt.resx">
+ <DependentUpon>SelectCheckDt.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="UserControl\ShowRptWizard.resx">
<DependentUpon>ShowRptWizard.cs</DependentUpon>
</EmbeddedResource>
@@ -530,6 +545,9 @@
<EmbeddedResource Include="UserControl\UcLookCk.resx">
<DependentUpon>UcLookCk.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="UserControl\UcLookItems.resx">
+ <DependentUpon>UcLookItems.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="UserControl\UcLookSupplier.resx">
<DependentUpon>UcLookSupplier.cs</DependentUpon>
</EmbeddedResource>
diff --git a/DevApp/Gs.DevApp/TestForm/XtraForm1.Designer.cs b/DevApp/Gs.DevApp/TestForm/XtraForm1.Designer.cs
index 5ab4030..9e31aef 100644
--- a/DevApp/Gs.DevApp/TestForm/XtraForm1.Designer.cs
+++ b/DevApp/Gs.DevApp/TestForm/XtraForm1.Designer.cs
@@ -33,12 +33,14 @@
this.ucLookCk1 = new Gs.DevApp.UserControl.UcLookCk();
this.ucLookSupplier1 = new Gs.DevApp.UserControl.UcLookSupplier();
this.simpleButton2 = new DevExpress.XtraEditors.SimpleButton();
+ this.ucLookItems1 = new Gs.DevApp.UserControl.UcLookItems();
+ this.simpleButton3 = new DevExpress.XtraEditors.SimpleButton();
this.SuspendLayout();
//
// label2
//
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(179, 134);
+ this.label2.Location = new System.Drawing.Point(45, 71);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(38, 18);
this.label2.TabIndex = 8;
@@ -46,7 +48,7 @@
//
// simpleButton1
//
- this.simpleButton1.Location = new System.Drawing.Point(169, 184);
+ this.simpleButton1.Location = new System.Drawing.Point(48, 106);
this.simpleButton1.Name = "simpleButton1";
this.simpleButton1.Size = new System.Drawing.Size(94, 29);
this.simpleButton1.TabIndex = 9;
@@ -55,7 +57,8 @@
//
// ucLookCk1
//
- this.ucLookCk1.Location = new System.Drawing.Point(182, 87);
+ this.ucLookCk1.KeyFile = "";
+ this.ucLookCk1.Location = new System.Drawing.Point(48, 24);
this.ucLookCk1.Margin = new System.Windows.Forms.Padding(0);
this.ucLookCk1.Name = "ucLookCk1";
this.ucLookCk1.Size = new System.Drawing.Size(219, 30);
@@ -63,7 +66,8 @@
//
// ucLookSupplier1
//
- this.ucLookSupplier1.Location = new System.Drawing.Point(604, 114);
+ this.ucLookSupplier1.KeyFile = "";
+ this.ucLookSupplier1.Location = new System.Drawing.Point(489, 24);
this.ucLookSupplier1.Margin = new System.Windows.Forms.Padding(0);
this.ucLookSupplier1.Name = "ucLookSupplier1";
this.ucLookSupplier1.Size = new System.Drawing.Size(228, 30);
@@ -71,18 +75,37 @@
//
// simpleButton2
//
- this.simpleButton2.Location = new System.Drawing.Point(661, 183);
+ this.simpleButton2.Location = new System.Drawing.Point(546, 93);
this.simpleButton2.Name = "simpleButton2";
this.simpleButton2.Size = new System.Drawing.Size(94, 29);
this.simpleButton2.TabIndex = 11;
this.simpleButton2.Text = "simpleButton2";
this.simpleButton2.Click += new System.EventHandler(this.simpleButton2_Click);
//
+ // ucLookItems1
+ //
+ this.ucLookItems1.KeyFile = "";
+ this.ucLookItems1.Location = new System.Drawing.Point(525, 189);
+ this.ucLookItems1.Name = "ucLookItems1";
+ this.ucLookItems1.Size = new System.Drawing.Size(266, 33);
+ this.ucLookItems1.TabIndex = 12;
+ //
+ // simpleButton3
+ //
+ this.simpleButton3.Location = new System.Drawing.Point(525, 268);
+ this.simpleButton3.Name = "simpleButton3";
+ this.simpleButton3.Size = new System.Drawing.Size(94, 29);
+ this.simpleButton3.TabIndex = 13;
+ this.simpleButton3.Text = "simpleButton3";
+ this.simpleButton3.Click += new System.EventHandler(this.simpleButton3_Click);
+ //
// XtraForm1
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(890, 396);
+ this.Controls.Add(this.simpleButton3);
+ this.Controls.Add(this.ucLookItems1);
this.Controls.Add(this.simpleButton2);
this.Controls.Add(this.ucLookSupplier1);
this.Controls.Add(this.simpleButton1);
@@ -101,5 +124,7 @@
private DevExpress.XtraEditors.SimpleButton simpleButton1;
private UserControl.UcLookSupplier ucLookSupplier1;
private DevExpress.XtraEditors.SimpleButton simpleButton2;
+ private UserControl.UcLookItems ucLookItems1;
+ private DevExpress.XtraEditors.SimpleButton simpleButton3;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/TestForm/XtraForm1.cs b/DevApp/Gs.DevApp/TestForm/XtraForm1.cs
index 4a5f022..6cc4399 100644
--- a/DevApp/Gs.DevApp/TestForm/XtraForm1.cs
+++ b/DevApp/Gs.DevApp/TestForm/XtraForm1.cs
@@ -15,6 +15,7 @@
InitializeComponent();
// this.ucLookCk1.KeyFile = "depotId";
this.ucLookCk1.KeyFile = "depotCode";
+ this.ucLookItems1.KeyFile = "id";
ucLookCk1.EditChanged += UcLookCk1_EditChanged;
}
@@ -34,7 +35,12 @@
private void simpleButton2_Click(object sender, EventArgs e)
{
- ucLookSupplier1.SetIdOrCode("VEN00063");
+ ucLookItems1.SetIdOrCode("VEN00063");
+ }
+
+ private void simpleButton3_Click(object sender, EventArgs e)
+ {
+ ucLookItems1.SetIdOrCode("113223");
}
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookItems.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcLookItems.Designer.cs
index 3ab8623..e8434b3 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookItems.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookItems.Designer.cs
@@ -70,19 +70,23 @@
//
this.gridColumn1.Caption = "鐗╂枡ID";
this.gridColumn1.FieldName = "id";
+ this.gridColumn1.MaxWidth = 80;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.UnboundDataType = typeof(short);
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 0;
+ this.gridColumn1.Width = 42;
//
// gridColumn2
//
this.gridColumn2.Caption = "鐗╂枡缂栧彿";
this.gridColumn2.FieldName = "itemNo";
+ this.gridColumn2.MaxWidth = 80;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.UnboundDataType = typeof(string);
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 1;
+ this.gridColumn2.Width = 68;
//
// gridColumn3
//
@@ -91,6 +95,7 @@
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
this.gridColumn3.VisibleIndex = 2;
+ this.gridColumn3.Width = 150;
//
// gridColumn5
//
@@ -99,6 +104,7 @@
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 3;
+ this.gridColumn5.Width = 112;
//
// gridColumn4
//
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookItems.cs b/DevApp/Gs.DevApp/UserControl/UcLookItems.cs
index 8b66746..e96e881 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookItems.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookItems.cs
@@ -92,6 +92,12 @@
var name = lookSearchSupplier.Text.Trim();
return name;
}
+ public string GetModel()
+ {
+ var row = lookSearchSupplier.GetSelectedDataRow() as DataRowView;
+ string id = row["itemModel"].ToString();
+ return id;
+ }
public void SetIdOrCode(string Code)
{
--
Gitblit v1.9.3