From daff1bbc999ef2a3e33361876dfac4a396960474 Mon Sep 17 00:00:00 2001
From: cnf <3200815559@qq.com>
Date: 星期三, 06 八月 2025 15:34:10 +0800
Subject: [PATCH] 退补料完成
---
DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
index 063fc36..c09b7f4 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,7 +342,7 @@
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("鏍囧噯鍊煎繀椤诲湪涓婇檺鍜屼笅闄愪箣闂达紒");
@@ -367,7 +369,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 +427,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
{
@@ -739,6 +742,9 @@
,"1.50---(AQL_0_150)"
,"2.00---(AQL_0_200)"
,"2.50---(AQL_0_250)"
+ ,"4.00---(AQL_0_400)"
+ ,"6.50---(AQL_0_650)"
+ ,"10.00---(AQL_1_000)"
});
}
/// <summary>
--
Gitblit v1.9.3