From 73effbc7daccee2285717ab70d01df7ba54aa35e Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 20 六月 2025 09:03:01 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.Designer.cs | 4
DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs | 33 +++++--
DevApp/Gs.DevApp/DevFrm/RkQC/Frm_QtrkDetect01.Designer.cs | 60 +++++++++++++++
DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.resx | 3
DevApp/Gs.DevApp/Gs.DevApp.csproj | 25 +++++-
DevApp/Gs.DevApp/DevFrm/RkQC/Frm_SctlDetect01.resx | 3
DevApp/Gs.DevApp/DevFrm/RkQC/Frm_QtrkDetect01.cs | 21 +++++
DevApp/Gs.DevApp/DevFrm/RkQC/Frm_SctlDetect01.cs | 21 +++++
DevApp/Gs.DevApp/DevFrm/RkQC/Frm_SctlDetect01.Designer.cs | 60 +++++++++++++++
DevApp/Gs.DevApp/DevFrm/FQC/UcChouJianList.cs | 2
10 files changed, 208 insertions(+), 24 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/UcChouJianList.cs b/DevApp/Gs.DevApp/DevFrm/FQC/UcChouJianList.cs
index 8da4cea..cbd2429 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/UcChouJianList.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/UcChouJianList.cs
@@ -73,7 +73,7 @@
}
}
- private string _val;
+
/// <summary>
/// 涓婚敭
diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_QtrkDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_QtrkDetect01.Designer.cs
new file mode 100644
index 0000000..cba1089
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_QtrkDetect01.Designer.cs
@@ -0,0 +1,60 @@
+锘縰sing Gs.DevApp.ToolBox;
+
+namespace Gs.DevApp.DevFrm.RkQC
+{
+ partial class Frm_QtrkDetect01
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.rkDetect011 = new Gs.DevApp.DevFrm.RkQC.RkDetect01(QcSeason.鍏跺畠鍏ュ簱妫�.ToString());
+ this.SuspendLayout();
+ //
+ // rkDetect011
+ //
+ this.rkDetect011.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.rkDetect011.Location = new System.Drawing.Point(0, 0);
+ this.rkDetect011.Name = "rkDetect011";
+ this.rkDetect011.Size = new System.Drawing.Size(1118, 648);
+ this.rkDetect011.TabIndex = 0;
+ //
+ // Frm_RkDetect01
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(1118, 648);
+ this.Controls.Add(this.rkDetect011);
+ this.Name = "Frm_RkDetect01";
+ this.Text = "鍏跺畠鍏ュ簱妫�";
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private RkDetect01 rkDetect011;
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_QtrkDetect01.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_QtrkDetect01.cs
new file mode 100644
index 0000000..9be8117
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_QtrkDetect01.cs
@@ -0,0 +1,21 @@
+锘縰sing DevExpress.XtraEditors;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Gs.DevApp.DevFrm.RkQC
+{
+ public partial class Frm_QtrkDetect01 : DevExpress.XtraEditors.XtraForm
+ {
+ public Frm_QtrkDetect01()
+ {
+ InitializeComponent();
+ }
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_SctlDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_SctlDetect01.Designer.cs
new file mode 100644
index 0000000..f7b3494
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_SctlDetect01.Designer.cs
@@ -0,0 +1,60 @@
+锘縰sing Gs.DevApp.ToolBox;
+
+namespace Gs.DevApp.DevFrm.RkQC
+{
+ partial class Frm_SctlDetect01
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.rkDetect011 = new Gs.DevApp.DevFrm.RkQC.RkDetect01(QcSeason.鐢熶骇閫�鏂欏叆搴撴.ToString());
+ this.SuspendLayout();
+ //
+ // rkDetect011
+ //
+ this.rkDetect011.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.rkDetect011.Location = new System.Drawing.Point(0, 0);
+ this.rkDetect011.Name = "rkDetect011";
+ this.rkDetect011.Size = new System.Drawing.Size(1118, 648);
+ this.rkDetect011.TabIndex = 0;
+ //
+ // Frm_RkDetect01
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(1118, 648);
+ this.Controls.Add(this.rkDetect011);
+ this.Name = "Frm_RkDetect01";
+ this.Text = "鐢熶骇閫�鏂欏叆搴撴";
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private RkDetect01 rkDetect011;
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_SctlDetect01.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_SctlDetect01.cs
new file mode 100644
index 0000000..170a961
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_SctlDetect01.cs
@@ -0,0 +1,21 @@
+锘縰sing DevExpress.XtraEditors;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Gs.DevApp.DevFrm.RkQC
+{
+ public partial class Frm_SctlDetect01 : DevExpress.XtraEditors.XtraForm
+ {
+ public Frm_SctlDetect01()
+ {
+ InitializeComponent();
+ }
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_RkDetect01.resx b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_SctlDetect01.resx
similarity index 96%
rename from DevApp/Gs.DevApp/DevFrm/RkQC/Frm_RkDetect01.resx
rename to DevApp/Gs.DevApp/DevFrm/RkQC/Frm_SctlDetect01.resx
index 5160e8b..1af7de1 100644
--- a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_RkDetect01.resx
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_SctlDetect01.resx
@@ -117,7 +117,4 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>17, 17</value>
- </metadata>
</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_RkDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.Designer.cs
similarity index 99%
rename from DevApp/Gs.DevApp/DevFrm/RkQC/Frm_RkDetect01.Designer.cs
rename to DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.Designer.cs
index ab7b92b..1723c3f 100644
--- a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_RkDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.Designer.cs
@@ -1,8 +1,8 @@
锘縩amespace Gs.DevApp.DevFrm.RkQC
{
- partial class Frm_RkDetect01
+ partial class RkDetect01
{
- /// <summary>
+ /// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_RkDetect01.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs
similarity index 96%
rename from DevApp/Gs.DevApp/DevFrm/RkQC/Frm_RkDetect01.cs
rename to DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs
index b41ec7c..c753744 100644
--- a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_RkDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs
@@ -13,14 +13,22 @@
namespace Gs.DevApp.DevFrm.RkQC
{
- public partial class Frm_RkDetect01 : DevExpress.XtraEditors.XtraForm
+ public partial class RkDetect01 : DevExpress.XtraEditors.XtraUserControl
{
string _strTag = "N:涓嶅悎鏍�";
List<FilterEntity> _filterList = new List<FilterEntity>();
- public Frm_RkDetect01()
+ public string strType = "";//iqc type
+ public RkDetect01(string _strType)
{
InitializeComponent();
+ strType = _strType;
+ }
+
+ protected override void OnCreateControl() {
+ base.OnCreateControl();
+ if (Parent == null) return;
+
this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
@@ -33,7 +41,8 @@
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1, tips);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx3);
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "fsubmitTxt", "", (value) =>
+ Form parentForm = this.FindForm();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, parentForm, "fsubmitTxt", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
}, tips);
@@ -126,8 +135,6 @@
Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut, txt_yuliang_1);
};
}
-
-
/// <summary>
/// 鎵归噺褰曞叆
/// </summary>
@@ -280,10 +287,15 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
{
+ Form parentForm;
+ if (this.Parent is Form)
+ parentForm = this.Parent as Form;
+ else
+ parentForm = this.Parent.Parent as Form;
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, parentForm.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
@@ -409,7 +421,7 @@
{
guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
fngDesc = txt_fngDesc.TextTxt.Trim(),
- ckId= rkckid
+ ckId = rkckid
};
try
{
@@ -443,7 +455,7 @@
private void getPageList(int curPage)
{
gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
- PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "release_no", "asc", "", _sbSqlWhere.ToString());
+ PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "release_no", "asc", "", " and a.order_type='"+ strType + "' " + _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
{
@@ -671,10 +683,11 @@
{
getModel(lbGuid.Text.Trim(), "0");
}
+ Form parentForm = this.FindForm();
int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
gridView1.FocusedRowHandle = rowHandle;
int _inFieldValue = (_meth == "EditModelSubmit" ? 1 : -1);
- UtilityHelper.SetCheckIco(gridView1, "fsubmitTxt", "", "iqcDate", picCheckBox, this, _inFieldValue.ToString());
+ UtilityHelper.SetCheckIco(gridView1, "fsubmitTxt", "", "iqcDate", picCheckBox, parentForm, _inFieldValue.ToString());
}
}
catch (Exception ex)
@@ -682,6 +695,6 @@
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
-
+
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_RkDetect01.resx b/DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.resx
similarity index 96%
copy from DevApp/Gs.DevApp/DevFrm/RkQC/Frm_RkDetect01.resx
copy to DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.resx
index 5160e8b..1af7de1 100644
--- a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_RkDetect01.resx
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.resx
@@ -117,7 +117,4 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>17, 17</value>
- </metadata>
</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 97ac992..73063ed 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -566,11 +566,23 @@
<Compile Include="DevFrm\QC\Models\MesQmCheckitemDt.cs" />
<Compile Include="DevFrm\QC\Models\MesSysLookups.cs" />
<Compile Include="DevFrm\QC\Models\MesSysLookupTypes.cs" />
- <Compile Include="DevFrm\RkQC\Frm_RkDetect01.cs">
+ <Compile Include="DevFrm\RkQC\Frm_QtrkDetect01.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Include="DevFrm\RkQC\Frm_RkDetect01.Designer.cs">
- <DependentUpon>Frm_RkDetect01.cs</DependentUpon>
+ <Compile Include="DevFrm\RkQC\Frm_QtrkDetect01.Designer.cs">
+ <DependentUpon>Frm_QtrkDetect01.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\RkQC\Frm_SctlDetect01.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\RkQC\Frm_SctlDetect01.Designer.cs">
+ <DependentUpon>Frm_SctlDetect01.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\RkQC\RkDetect01.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="DevFrm\RkQC\RkDetect01.Designer.cs">
+ <DependentUpon>RkDetect01.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\Rk\Frm_MesInvItemIns.cs">
<SubType>Form</SubType>
@@ -1489,8 +1501,11 @@
<EmbeddedResource Include="DevFrm\QC\MesQcExceptional.resx">
<DependentUpon>MesQcExceptional.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="DevFrm\RkQC\Frm_RkDetect01.resx">
- <DependentUpon>Frm_RkDetect01.cs</DependentUpon>
+ <EmbeddedResource Include="DevFrm\RkQC\Frm_SctlDetect01.resx">
+ <DependentUpon>Frm_SctlDetect01.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\RkQC\RkDetect01.resx">
+ <DependentUpon>RkDetect01.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\Rk\Frm_MesInvItemIns.resx">
<DependentUpon>Frm_MesInvItemIns.cs</DependentUpon>
--
Gitblit v1.9.3