cyf/lserp_cs_6.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SVN r622

Browse Source 
SVN-Revision: r622
This commit is contained in:
wyf
2025-05-22 08:42:22 +00:00
parent fad840cc9c
commit 0c35b18c44
1 changed files with 37 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
插件库/Lskj.PubAccraditation/FrmAccraditation.cs
+37 -4
View File
@@ -32,6 +32,8 @@ using Lskj.Core;
using System.Threading.Tasks; using System.Threading.Tasks;
using DevExpress.Utils; using DevExpress.Utils;
using DevExpress.Data; using DevExpress.Data;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
namespace Lskj.PubAccraditation namespace Lskj.PubAccraditation
{ {
@@ -1254,10 +1256,41 @@ namespace Lskj.PubAccraditation
if (dataTable != null) if (dataTable != null)
{ {
//DataTable dataMain = dataTable.Copy(); //DataTable dataMain = dataTable.Copy();
string sqlValue = "select * from RD_worktimetab where 1 = 1"; //string sqlValue = "select * from RD_worktimetab where 1 = 1";
sqlValue = $"{sqlValue} and lblOrderNo = '{billNo}' and showday >= '{dateTime.ToString("yyyy-MM-dd")}'"; //sqlValue = $"{sqlValue} and lblOrderNo = '{billNo}' and showday >= '{dateTime.ToString("yyyy-MM-dd")}'";
DataTable dataDayPlan = BaseImpl.GetDataTableResult(sqlValue); //DataTable dataDayPlan = BaseImpl.GetDataTableResult(sqlValue);
MergeMainDataWithDayPlan(dataTable, dataDayPlan, dateTime); //---------- 查询①：渲染表格排程” ----------
string sqlExcludePlan = "SELECT * FROM RD_worktimetab WHERE 1 = 1";
sqlExcludePlan += $" AND lblOrderNo = '{billNo}'";
sqlExcludePlan += $" AND showday >= '{dateTime:yyyy-MM-dd}'";
sqlExcludePlan += " AND billdocument_id NOT LIKE N'计划文件%'";
// 获取结果
DataTable dataNoPlanFile = BaseImpl.GetDataTableResult(sqlExcludePlan);
// ---------- 查询②：只包含“计划文件” ----------
string sqlIncludePlan = "SELECT billdocument_id FROM RD_worktimetab WHERE 1 = 1";
sqlIncludePlan += $" AND lblOrderNo = '{billNo}'";
sqlIncludePlan += $" AND showday >= '{dateTime:yyyy-MM-dd}'";
sqlIncludePlan += " AND billdocument_id LIKE N'计划文件%'";
// 获取结果
DataTable dataOnlyPlanFile = BaseImpl.GetDataTableResult(sqlIncludePlan);
MergeMainDataWithDayPlan(dataTable, dataNoPlanFile, dateTime);
//若存在缓存计划数据则渲染合计
if (dataOnlyPlanFile.Rows.Count > 0)
{
string jhrowtiemjson = (dataOnlyPlanFile.Rows[0]["billdocument_id"] + "").Replace("计划文件", "");
try
{
JObject rowObject = JsonConvert.DeserializeObject<JObject>(jhrowtiemjson);
JArray jArray = new JArray();
jArray.Add(rowObject);
DataRow jhrowitem = JsonConvert.DeserializeObject<DataTable>(JsonConvert.SerializeObject(jArray)).Rows[0];
//渲染计划合计
gridBillInfo.AddHeadquarters(jhrowitem);
}
catch (Exception)
{
}
}
this.gridBillInfo.GridControl.DataSource = null; this.gridBillInfo.GridControl.DataSource = null;
this.gridBillInfo.GridControl.DataSource = dataTable; this.gridBillInfo.GridControl.DataSource = dataTable;
} }