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

SVN r626

Browse Source 
SVN-Revision: r626
This commit is contained in:
tdx
2025-05-22 13:41:01 +00:00
parent 8ff9758901
commit 7acac9db1a
1 changed files with 7 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
插件库/Lskj.PubBill/BillModule.cs
+6 -35
View File
@@ -4806,7 +4806,7 @@ namespace Lskj.PubBill
// 插入数据到临时表 // 插入数据到临时表
DataRow dr = tvp.NewRow(); DataRow dr = tvp.NewRow();
dr["lblOrderNo"] = billNo; dr["lblOrderNo"] = billNo;
dr["billdocument_id"] = "计划文件"+ gcMain.jhrowitem.ToJsonObject(); dr["billdocument_id"] = "计划文件" + gcMain.jhrowitem.ToJsonObject();
if (DateColumnList.Count > 0 && DateColumnList[0].Tag is DateTime dateTime) if (DateColumnList.Count > 0 && DateColumnList[0].Tag is DateTime dateTime)
{ {
dr["showday"] = dateTime.ToString("yyyy-MM-dd"); //日期 dr["showday"] = dateTime.ToString("yyyy-MM-dd"); //日期
@@ -5365,15 +5365,15 @@ namespace Lskj.PubBill
DataTable dataOnlyPlanFile = BaseImpl.GetDataTableResult(sqlIncludePlan); DataTable dataOnlyPlanFile = BaseImpl.GetDataTableResult(sqlIncludePlan);
MergeMainDataWithDayPlan(dataTable, dataNoPlanFile, dateTime); MergeMainDataWithDayPlan(dataTable, dataNoPlanFile, dateTime);
//若存在缓存计划数据则渲染合计 //若存在缓存计划数据则渲染合计
if (dataOnlyPlanFile.Rows.Count>0) if (dataOnlyPlanFile.Rows.Count > 0)
{ {
string jhrowtiemjson = (dataOnlyPlanFile.Rows[0]["billdocument_id"] + "").Replace("计划文件",""); string jhrowtiemjson = (dataOnlyPlanFile.Rows[0]["billdocument_id"] + "").Replace("计划文件", "");
try try
{ {
JObject rowObject = JsonConvert.DeserializeObject<JObject>(jhrowtiemjson); JObject rowObject = JsonConvert.DeserializeObject<JObject>(jhrowtiemjson);
JArray jArray = new JArray(); JArray jArray = new JArray();
jArray.Add(rowObject); jArray.Add(rowObject);
DataRow jhrowitem= JsonConvert.DeserializeObject<DataTable>(JsonConvert.SerializeObject(jArray)).Rows[0]; DataRow jhrowitem = JsonConvert.DeserializeObject<DataTable>(JsonConvert.SerializeObject(jArray)).Rows[0];
//渲染计划合计 //渲染计划合计
gcMain.AddHeadquarters(jhrowitem); gcMain.AddHeadquarters(jhrowitem);
} }
@@ -5381,6 +5381,7 @@ namespace Lskj.PubBill
{ {
} }
} }
gcMain.RefreshHeaderColor();
this.gcMain.GridControl.DataSource = null; this.gcMain.GridControl.DataSource = null;
this.gcMain.GridControl.DataSource = dataTable; this.gcMain.GridControl.DataSource = dataTable;
} }
@@ -8248,34 +8249,4 @@ namespace Lskj.PubBill
/// </summary> /// </summary>
/// <param name="cond">The cond.</param> /// <param name="cond">The cond.</param>
/// <param name="dataRow">The data row.</param> /// <param name="dataRow">The data row.</param>
/// <returns><c>true</c> if XXXX, <c>false</c> otherwise.</returns> /// <returns><c>true</c> if X
private bool ValidateCond(string cond, DataRow dataRow)
{
bool result = false;
string condition = cond;
try
{
if (string.IsNullOrWhiteSpace(cond)) return true;//如果值是空格或者空行，默认正确
cond = ReplaceHelper.ReplaceRowParam(dataRow, cond);
if (cond.StartsWith("@") || cond.StartsWith("!"))
{
result = "1".Equals(BaseImpl.GetDefaultValue(cond));
}
else if (dataRow == null)
{
result = ReplaceHelper.EvalCond(cond);
}
else
{
result = ReplaceHelper.ReplaceRowParamCond(dataRow, cond);
}
return result;
}
catch (Exception ex)
{
}
return result;
}
}
}