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

SVN r619

Browse Source 
SVN-Revision: r619
This commit is contained in:
tdx
2025-05-22 06:19:44 +00:00
parent 1549d52346
commit 58255abd07
2 changed files with 105 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
插件库/Lskj.PubBill/BillModule.cs
+53 -6
View File
@@ -33,6 +33,8 @@ using DevExpress.XtraTreeList.Columns;
using System.Threading.Tasks;
using DevExpress.Utils;
using System.Data.SqlClient;
using Newtonsoft.Json.Linq;
using Newtonsoft.Json;
namespace Lskj.PubBill
{
@@ -1260,11 +1262,11 @@ namespace Lskj.PubBill
}
}
}
if (dataTable != null && dataTable.Columns.Contains("项目代号"))
if (dataTable != null && dataTable.Columns.Contains("num"))
{
MultiLineSummary = true;
gcMain.GridView.OptionsView.ShowFooter = true;
DataRow[] dataRows = dataTable.Select("项目代号='胡波'");
DataRow[] dataRows = dataTable.Select("num='999'");
DataRow dataRow = dataRows != null && dataRows.Length > 0 ? dataRows[0] : null;
//树表格
gcMain.AddHeadquarters(dataRow);
@@ -4792,10 +4794,24 @@ namespace Lskj.PubBill
//保存完成后所有数据源进行拼接执行保存
if (tvp != null && tvp.Rows.Count > 0)
{
if (gcMain.jhrowitem != null)
{
// 插入数据到临时表
DataRow dr = tvp.NewRow();
dr["lblOrderNo"] = billNo;
dr["billdocument_id"] = "计划文件"+ gcMain.jhrowitem.ToJsonObject();
if (DateColumnList.Count > 0 && DateColumnList[0].Tag is DateTime dateTime)
{
dr["showday"] = dateTime.ToString("yyyy-MM-dd"); //日期
}
tvp.Rows.Add(dr);
}
foreach (DataRow item in tvp.Rows)
{
item["lblOrderNo"] = billNo;
}
// 调用存储过程保存变更数据
string msg;
int ret = SaveDayPlanChanges(tvp, out msg);
@@ -5323,10 +5339,41 @@ namespace Lskj.PubBill
if (dataTable != null)
{
//DataTable dataMain = dataTable.Copy();
string sqlValue = "select * from RD_worktimetab where 1 = 1";
sqlValue = $"{sqlValue} and lblOrderNo = '{billNo}' and showday >= '{dateTime.ToString("yyyy-MM-dd")}'";
DataTable dataDayPlan = BaseImpl.GetDataTableResult(sqlValue);
MergeMainDataWithDayPlan(dataTable, dataDayPlan, dateTime);
//string sqlValue = "select * from RD_worktimetab where 1 = 1";
//sqlValue = $"{sqlValue} and lblOrderNo = '{billNo}' and showday >= '{dateTime.ToString("yyyy-MM-dd")}'";
//DataTable dataDayPlan = BaseImpl.GetDataTableResult(sqlValue);
//---------- 查询①：渲染表格排程” ----------
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];
//渲染计划合计
gcMain.AddHeadquarters(jhrowitem);
}
catch (Exception)
{
}
}
this.gcMain.GridControl.DataSource = null;
this.gcMain.GridControl.DataSource = dataTable;
}