From 8b8f940172c599422dd90f6129ffe4c00cb861cf Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期四, 25 九月 2025 18:27:27 +0800
Subject: [PATCH] jzm
---
DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs | 37 ++++++++++++++++++++++++++++++++++---
1 files changed, 34 insertions(+), 3 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
index c09b7f4..3b0da40 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
@@ -342,12 +342,43 @@
decimal _Fstand_f = Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(_Fstand);
decimal _FupAllow_f = Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(_FupAllow);
decimal _FdownAllow_f = Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(_FdownAllow);
- if (_Fstand_f >= _FdownAllow_f && _Fstand_f <= _FupAllow_f) { _ycsl = 5; }
+
+ /* if (_Fstand_f >= _FdownAllow_f && _Fstand_f <= _FupAllow_f) { _ycsl = 5; }
+ else
+ {
+ MsgHelper.ShowError("鏍囧噯鍊煎繀椤诲湪涓婇檺鍜屼笅闄愪箣闂达紒");
+ return;
+ }
+ */
+
+ //浼樺寲鍚庣殑浠ｇ爜锛屼富瑕佹槸鍦ㄧ粰_ycsl璧嬪�肩殑閮ㄥ垎澧炲姞浜嗗SampleSizeNo鐨勫垽鏂�
+ if (_Fstand_f >= _FdownAllow_f && _Fstand_f <= _FupAllow_f)
+ {
+ string sampleSizeNo = row["SampleSizeNo"].ToString().ToUpper();
+ if (sampleSizeNo.StartsWith("GB"))
+ {
+ _ycsl = 5;
+ }
+ else if (sampleSizeNo.StartsWith("PC"))
+ {
+ string[] parts = sampleSizeNo.Split('=');
+ if (parts.Length > 1 && int.TryParse(parts[1], out int value))
+ {
+ _ycsl = value;
+ }
+ else
+ {
+ MsgHelper.ShowError("PCS鏍煎紡涓嶆纭�");
+ return;
+ }
+ }
+ }
else
{
MsgHelper.ShowError("鏍囧噯鍊煎繀椤诲湪涓婇檺鍜屼笅闄愪箣闂达紒");
return;
}
+
}
else
{
@@ -369,8 +400,8 @@
Memo = row["memo"].ToString(),
FupAllow = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(row["FupAllow"].ToString()),
FdownAllow = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(row["FdownAllow"].ToString()),
- //ypsl = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(row["ypsl"].ToString()),
- ypsl = _ycsl,
+ ypsl = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(row["ypsl"].ToString()),
+ // ypsl = _ycsl,
stationName = row["stationName"].ToString(),
FcheckType = row["FcheckType"].ToString(),
isRzxx = _isRzxx,
--
Gitblit v1.9.3