From bb59b3c2baa039889b74aef492a90883d69c4855 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期三, 10 九月 2025 14:38:16 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FQCItem.cs | 107 ++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 97 insertions(+), 10 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FQCItem.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FQCItem.cs
index 5605b63..4eedd64 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FQCItem.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FQCItem.cs
@@ -42,7 +42,8 @@
this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
-
+ txt_SampleSize1.Leave += txt_SampleSize1_Leave;
+ txt_SampleSize2.Leave += txt_SampleSize2_Leave;
// 娣诲姞鎶芥牱鏂规硶涓嬫媺妗嗕簨浠�
this.txt_SampleMethod.SelectedIndexChanged += Txt_SampleMethod_SelectedIndexChanged;
@@ -51,7 +52,7 @@
// 璁剧疆GridView鍙傛暟
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gridView2);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gridView3);
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "checkStatus", "", (value) =>
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, this, "checkStatus", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
}, tips);
@@ -79,7 +80,8 @@
if (comboBox != null)
{
string selectedValue = comboBox.Text.Trim();
-
+ int sampleSize = 0;
+
if (selectedValue == "鍖�閫�")
{
// 閫夋嫨鍖�閫熸椂锛氬惎鐢ㄥ寑閫熸娊鏍锋暟锛岀鐢ㄩ殢鏈烘娊鏍锋暟
@@ -89,6 +91,9 @@
txt_SampleSize2.Properties.ReadOnly = true;
txt_SampleSize2.Properties.Appearance.BackColor = Color.WhiteSmoke;
txt_SampleSize2.Text = ""; // 娓呯┖闅忔満鎶芥牱鏁�
+
+ if (int.TryParse(txt_SampleSize1.Text.Trim(), out int size))
+ sampleSize = size;
}
else if (selectedValue == "闅忔満")
{
@@ -99,6 +104,9 @@
txt_SampleSize1.Properties.ReadOnly = true;
txt_SampleSize1.Properties.Appearance.BackColor = Color.WhiteSmoke;
txt_SampleSize1.Text = ""; // 娓呯┖鍖�閫熸娊鏍锋暟
+
+ if (int.TryParse(txt_SampleSize2.Text.Trim(), out int size))
+ sampleSize = size;
}
else
{
@@ -111,7 +119,48 @@
txt_SampleSize2.Properties.Appearance.BackColor = Color.WhiteSmoke;
txt_SampleSize2.Text = "";
}
+
+ UpdateGridViewColumns(sampleSize);
}
+ }
+
+ private void UpdateGridViewColumns(int sampleSize)
+ {
+ if (sampleSize < 0 || sampleSize > 16)
+ return;
+
+ // 鑾峰彇鎵�鏈夊�煎垪锛堝��1鍒板��16锛�
+ var valueColumns = new[]
+ {
+ gridColumn11, // 鍊�1
+ gridColumn12, // 鍊�2
+ gridColumn13, // 鍊�3
+ gridColumn14, // 鍊�4
+ gridColumn15, // 鍊�5
+ gridColumn16, // 鍊�6
+ gridColumn18, // 鍊�7
+ gridColumn19, // 鍊�8
+ gridColumn36, // 鍊�9
+ gridColumn37, // 鍊�10
+ gridColumn38, // 鍊�11
+ gridColumn39, // 鍊�12
+ gridColumn40, // 鍊�13
+ gridColumn49, // 鍊�14
+ gridColumn50, // 鍊�15
+ gridColumn51 // 鍊�16
+ };
+
+ // 璁剧疆鍒楃殑鍙鎬�
+ for (int i = 0; i < valueColumns.Length; i++)
+ {
+ if (valueColumns[i] != null)
+ {
+ valueColumns[i].Visible = i < sampleSize;
+ }
+ }
+
+ // 鍒锋柊GridView
+ gridView2.BestFitColumns();
}
/// <summary>
@@ -311,23 +360,23 @@
itemName = txt_ItemName.Text.Trim(), // 浜у搧鍚嶇О
itemModel = txt_ItemModel.Text.Trim(), // 瑙勬牸鍨嬪彿
brand = txt_Brand.Text.Trim(), // 鍟嗘爣
- productionDate = txt_ProductionDate.Text.Trim(), // 鐢熶骇鏃ユ湡
+ productionDate = txt_productionDate.Text.Trim(), // 鐢熶骇鏃ユ湡
temperature = txt_Temperature.Text.Trim(), // 瀹ゆ俯
voltage = txt_Voltage.Text.Trim(), // 鐢靛帇
lineNo = txt_LineNo.Text.Trim(), // 绾垮彿
batch = txt_Batch.Text.Trim(), // 鎵归噺
classes = txt_Classes.Text.Trim(), // 鐝
- checkResult = txt_CheckResult.Text.Trim(), // 妫�楠岀粨鏋�
- acRe_A = txt_AcRe_A.Text.Trim(), // AC/Re A绫�
- acRe_B = txt_AcRe_B.Text.Trim(), // AC/Re B绫�
- acRe_C = txt_AcRe_C.Text.Trim(), // AC/Re C绫�
+ checkResult = txt_checkResult.Text.Trim(), // 妫�楠岀粨鏋�
+ acRe_A = txt_acReA.Text.Trim(), // AC/Re A绫�
+ acRe_B = txt_acReB.Text.Trim(), // AC/Re B绫�
+ acRe_C = txt_acReC.Text.Trim(), // AC/Re C绫�
processResults = txt_ProcessResults.Text.Trim(), // 澶勭悊缁撴灉
sampleMethod = txt_SampleMethod.Text.Trim(), // 鎶芥牱
sampleSize1 = txt_SampleSize1.Text.Trim(), // 鍖�閫熸娊鏍锋暟
sampleSize2 = txt_SampleSize2.Text.Trim(), // 闅忔満鎶芥牱鏁�
sampleSize3 = txt_SampleSize3.Text.Trim(), // 鏍锋湰鏁�
- jy_USER = txt_JY_USER.Text.Trim(), // 妫�楠屼汉
- jy_DATE = txt_JY_DATE.Text.Trim(), // 妫�楠屾椂闂�
+ jy_USER = txt_jyUSER.Text.Trim(), // 妫�楠屼汉
+ jy_DATE = txt_jyDATE.Text.Trim(), // 妫�楠屾椂闂�
sp_USER = txt_SP_USER.Text.Trim(), // 瀹℃壒浜�
sp_DATE = txt_SP_DATE.Text.Trim(), // 瀹℃壒鏃ユ湡
remark = txt_Remark.Text.Trim(), // 澶囨敞
@@ -549,6 +598,14 @@
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gridControl2, gridView3);
}
}
+ if (int.TryParse(txt_SampleSize1.Text.Trim(), out int size))
+ {
+ UpdateGridViewColumns(size);
+ }
+ else
+ {
+ UpdateGridViewColumns(0);
+ }
}
else
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
@@ -636,5 +693,35 @@
}
}
}
+
+ private void txt_SampleSize1_Leave(object sender, EventArgs e)
+ {
+ if (txt_SampleMethod.Text.Trim() == "鍖�閫�")
+ {
+ if (int.TryParse(txt_SampleSize1.Text.Trim(), out int size))
+ {
+ UpdateGridViewColumns(size);
+ }
+ else
+ {
+ UpdateGridViewColumns(0);
+ }
+ }
+ }
+
+ private void txt_SampleSize2_Leave(object sender, EventArgs e)
+ {
+ if (txt_SampleMethod.Text.Trim() == "闅忔満")
+ {
+ if (int.TryParse(txt_SampleSize2.Text.Trim(), out int size))
+ {
+ UpdateGridViewColumns(size);
+ }
+ else
+ {
+ UpdateGridViewColumns(0);
+ }
+ }
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.3