From b031fc6dfe8288380258bd8b17a69bd4d4d6f165 Mon Sep 17 00:00:00 2001
From: cnf <3200815559@qq.com>
Date: 星期四, 11 九月 2025 18:53:09 +0800
Subject: [PATCH] 首检
---
DevApp/Gs.DevApp/XtraForm1.Designer.cs | 46 ++++++++++++++++-------
DevApp/Gs.DevApp/Gs.DevApp.csproj | 24 ++++++++++++
DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.Designer.cs | 2
DevApp/Gs.DevApp/Properties/licenses.licx | 39 ++++++++++---------
4 files changed, 77 insertions(+), 34 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.Designer.cs
index 12bb028..0d62858 100644
--- a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.Designer.cs
@@ -717,7 +717,7 @@
// rptButtonUrl
//
this.rptButtonUrl.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.boposition2_16x162;
+ // editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.boposition2_16x162;
editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.rptButtonUrl.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "鍘绘楠�", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 21ab878..ad48e83 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -74,6 +74,8 @@
</Reference>
<Reference Include="DevExpress.BonusSkins.v22.2" />
<Reference Include="DevExpress.Charts.v22.2.Core, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+ <Reference Include="DevExpress.DataAccess.v22.2.UI, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+ <Reference Include="DevExpress.DataVisualization.v22.2.Core, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.Drawing.v22.2" />
<Reference Include="DevExpress.Data.v22.2" />
<Reference Include="DevExpress.DataAccess.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
@@ -84,6 +86,7 @@
<Reference Include="DevExpress.RichEdit.v22.2.Core, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.RichEdit.v22.2.Export, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Data.Desktop.v22.2" />
+ <Reference Include="DevExpress.Spreadsheet.v22.2.Core, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.Utils.v22.2" />
<Reference Include="DevExpress.Sparkline.v22.2.Core" />
<Reference Include="DevExpress.Utils.v22.2.UI, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
@@ -99,7 +102,10 @@
<Reference Include="DevExpress.XtraPrinting.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.XtraReports.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraReports.v22.2.Extensions, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+ <Reference Include="DevExpress.XtraRichEdit.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+ <Reference Include="DevExpress.XtraSpreadsheet.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraTreeList.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+ <Reference Include="DevExpress.XtraTreeMap.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.XtraWizard.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="FastReport">
<HintPath>D:\GsMesV2\DevApp\Gs.DevApp\bin\Debug\FastReport.dll</HintPath>
@@ -370,6 +376,12 @@
<Compile Include="DevFrm\FrmMain.Designer.cs">
<DependentUpon>FrmMain.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\IPQC\Frm_ShouJianDetect01H5.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\IPQC\Frm_ShouJianDetect01H5.Designer.cs">
+ <DependentUpon>Frm_ShouJianDetect01H5.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\IPQC\Frm_XunJianDetect01Show.cs">
<SubType>Form</SubType>
</Compile>
@@ -577,6 +589,12 @@
<Compile Include="DevFrm\QC\Models\MesQmCheckitemDt.cs" />
<Compile Include="DevFrm\QC\Models\MesSysLookups.cs" />
<Compile Include="DevFrm\QC\Models\MesSysLookupTypes.cs" />
+ <Compile Include="DevFrm\QC\Xls.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\QC\Xls.Designer.cs">
+ <DependentUpon>Xls.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\RkQC\Frm_RkDetect01.cs">
<SubType>Form</SubType>
</Compile>
@@ -1506,6 +1524,9 @@
<EmbeddedResource Include="DevFrm\IPQC\Frm_ShouJianDetect01.resx">
<DependentUpon>Frm_ShouJianDetect01.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\IPQC\Frm_ShouJianDetect01H5.resx">
+ <DependentUpon>Frm_ShouJianDetect01H5.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\IPQC\Frm_XunJianDetect01.resx">
<DependentUpon>Frm_XunJianDetect01.cs</DependentUpon>
</EmbeddedResource>
@@ -1578,6 +1599,9 @@
<EmbeddedResource Include="DevFrm\QC\MesQcExceptional.resx">
<DependentUpon>MesQcExceptional.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\QC\Xls.resx">
+ <DependentUpon>Xls.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\RkQC\Frm_RkDetect01.resx">
<DependentUpon>Frm_RkDetect01.cs</DependentUpon>
</EmbeddedResource>
diff --git a/DevApp/Gs.DevApp/Properties/licenses.licx b/DevApp/Gs.DevApp/Properties/licenses.licx
index e6eb2d1..35f3cde 100644
--- a/DevApp/Gs.DevApp/Properties/licenses.licx
+++ b/DevApp/Gs.DevApp/Properties/licenses.licx
@@ -1,24 +1,25 @@
-DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.SearchLookUpEdit, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.ImageComboBoxEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemGridLookUpEdit, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemDateEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.ProgressBarControl, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.TreeListLookUpEdit, DevExpress.XtraTreeList.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraDataLayout.DataLayoutControl, DevExpress.XtraLayout.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraWizard.WizardControl, DevExpress.XtraWizard.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.SearchLookUpEdit, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ImageComboBoxEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraDataLayout.DataLayoutControl, DevExpress.XtraLayout.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemGridLookUpEdit, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraSpreadsheet.SpreadsheetControl, DevExpress.XtraSpreadsheet.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ProgressBarControl, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.TreeListLookUpEdit, DevExpress.XtraTreeList.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
diff --git a/DevApp/Gs.DevApp/XtraForm1.Designer.cs b/DevApp/Gs.DevApp/XtraForm1.Designer.cs
index 3602d04..c91c305 100644
--- a/DevApp/Gs.DevApp/XtraForm1.Designer.cs
+++ b/DevApp/Gs.DevApp/XtraForm1.Designer.cs
@@ -34,73 +34,90 @@
this.simpleButton3 = new DevExpress.XtraEditors.SimpleButton();
this.buttonEdit1 = new DevExpress.XtraEditors.ButtonEdit();
this.toggleSwitch1 = new DevExpress.XtraEditors.ToggleSwitch();
+ this.spreadsheetControl1 = new DevExpress.XtraSpreadsheet.SpreadsheetControl();
((System.ComponentModel.ISupportInitialize)(this.buttonEdit1.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.toggleSwitch1.Properties)).BeginInit();
this.SuspendLayout();
//
// simpleButton1
//
- this.simpleButton1.Location = new System.Drawing.Point(57, 107);
+ this.simpleButton1.Location = new System.Drawing.Point(50, 83);
+ this.simpleButton1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.simpleButton1.Name = "simpleButton1";
- this.simpleButton1.Size = new System.Drawing.Size(94, 29);
+ this.simpleButton1.Size = new System.Drawing.Size(82, 23);
this.simpleButton1.TabIndex = 0;
this.simpleButton1.Text = "鐢垫鏁版嵁";
this.simpleButton1.Click += new System.EventHandler(this.simpleButton1_Click_1);
//
// simpleButton2
//
- this.simpleButton2.Location = new System.Drawing.Point(57, 173);
+ this.simpleButton2.Location = new System.Drawing.Point(50, 135);
+ this.simpleButton2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.simpleButton2.Name = "simpleButton2";
- this.simpleButton2.Size = new System.Drawing.Size(94, 29);
+ this.simpleButton2.Size = new System.Drawing.Size(82, 23);
this.simpleButton2.TabIndex = 1;
this.simpleButton2.Text = "姘存鏁版嵁";
this.simpleButton2.Click += new System.EventHandler(this.simpleButton2_Click);
//
// richTextBox1
//
- this.richTextBox1.Location = new System.Drawing.Point(57, 227);
+ this.richTextBox1.Location = new System.Drawing.Point(50, 177);
+ this.richTextBox1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.richTextBox1.Name = "richTextBox1";
- this.richTextBox1.Size = new System.Drawing.Size(740, 240);
+ this.richTextBox1.Size = new System.Drawing.Size(648, 188);
this.richTextBox1.TabIndex = 2;
this.richTextBox1.Text = "";
//
// simpleButton3
//
- this.simpleButton3.Location = new System.Drawing.Point(471, 85);
+ this.simpleButton3.Location = new System.Drawing.Point(412, 66);
+ this.simpleButton3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.simpleButton3.Name = "simpleButton3";
- this.simpleButton3.Size = new System.Drawing.Size(94, 29);
+ this.simpleButton3.Size = new System.Drawing.Size(82, 23);
this.simpleButton3.TabIndex = 3;
this.simpleButton3.Text = "simpleButton3";
//
// buttonEdit1
//
- this.buttonEdit1.Location = new System.Drawing.Point(312, 147);
+ this.buttonEdit1.Location = new System.Drawing.Point(273, 114);
+ this.buttonEdit1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.buttonEdit1.Name = "buttonEdit1";
this.buttonEdit1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton()});
- this.buttonEdit1.Size = new System.Drawing.Size(125, 24);
+ this.buttonEdit1.Size = new System.Drawing.Size(109, 20);
this.buttonEdit1.TabIndex = 4;
//
// toggleSwitch1
//
- this.toggleSwitch1.Location = new System.Drawing.Point(293, 13);
+ this.toggleSwitch1.Location = new System.Drawing.Point(256, 10);
+ this.toggleSwitch1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.toggleSwitch1.Name = "toggleSwitch1";
this.toggleSwitch1.Properties.OffText = "Off";
this.toggleSwitch1.Properties.OnText = "On";
- this.toggleSwitch1.Size = new System.Drawing.Size(288, 24);
+ this.toggleSwitch1.Size = new System.Drawing.Size(252, 19);
this.toggleSwitch1.TabIndex = 5;
+ //
+ // spreadsheetControl1
+ //
+ this.spreadsheetControl1.Location = new System.Drawing.Point(152, 232);
+ this.spreadsheetControl1.Name = "spreadsheetControl1";
+ this.spreadsheetControl1.Size = new System.Drawing.Size(400, 200);
+ this.spreadsheetControl1.TabIndex = 6;
+ this.spreadsheetControl1.Text = "spreadsheetControl1";
//
// XtraForm1
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(887, 659);
+ this.ClientSize = new System.Drawing.Size(776, 513);
+ this.Controls.Add(this.spreadsheetControl1);
this.Controls.Add(this.toggleSwitch1);
this.Controls.Add(this.buttonEdit1);
this.Controls.Add(this.simpleButton3);
this.Controls.Add(this.richTextBox1);
this.Controls.Add(this.simpleButton2);
this.Controls.Add(this.simpleButton1);
+ this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.Name = "XtraForm1";
this.Text = "XtraForm1";
((System.ComponentModel.ISupportInitialize)(this.buttonEdit1.Properties)).EndInit();
@@ -117,5 +134,6 @@
private DevExpress.XtraEditors.SimpleButton simpleButton3;
private DevExpress.XtraEditors.ButtonEdit buttonEdit1;
private DevExpress.XtraEditors.ToggleSwitch toggleSwitch1;
+ private DevExpress.XtraSpreadsheet.SpreadsheetControl spreadsheetControl1;
}
}
\ No newline at end of file
--
Gitblit v1.9.3