From 909f579cd488f5da42c1cb7b5373e3fa49bc023e Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期一, 01 九月 2025 13:20:25 +0800
Subject: [PATCH] 1、移除挪位置
---
DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs | 40 +++++++++++++++++++++++++++++++++++++---
1 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
index ffdbd65..ec5bacb 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
@@ -326,12 +326,14 @@
string _FupAllow = row["FupAllow"].ToString();
string _FdownAllow = row["FdownAllow"].ToString();
string _isRzxxTxt = row["isRzxx"].ToString();
+ decimal _ycsl = 0;
bool _isRzxx = false;
if (_isRzxxTxt == "1" || _isRzxxTxt.ToUpper() == "true".ToUpper())
_isRzxx = true;
//鍋囧涓変釜閮戒负绌洪�氳繃
if (string.IsNullOrEmpty(_Fstand) && string.IsNullOrEmpty(_FupAllow) && string.IsNullOrEmpty(_FdownAllow))
{
+
}
else
{
@@ -340,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) { }
+
+ /* 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
{
@@ -367,7 +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 = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(row["ypsl"].ToString()),
+ ypsl = _ycsl,
stationName = row["stationName"].ToString(),
FcheckType = row["FcheckType"].ToString(),
isRzxx = _isRzxx,
@@ -424,7 +458,7 @@
_sbSqlWhere += " and b.guid is not null";
_sbSqlWhere += " and a.FTYPE='" + this.strType + "'";
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount,
- "org.FNumber asc ,b.item_no asc,a.FVERSION desc", "", "", _sbSqlWhere.ToString());
+ "a.FONE_CHECKDATE desc", "", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
{
--
Gitblit v1.9.3