From 9010fdfa1f7f6fe29c76111ef95d6383c74ea313 Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期一, 22 九月 2025 11:09:10 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~kyy/LW_MesClient
---
DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
index a3330a8..3b0da40 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
@@ -400,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,
@@ -458,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