SVN r1218

SVN-Revision: r1218
This commit is contained in:
cyf
2026-06-22 02:22:19 +00:00
parent 313655d3ac
commit 72420dd59e
4 changed files with 1434 additions and 1410 deletions
+12 -2
View File
@@ -321,7 +321,9 @@ namespace Lskj.Business
Instance.ModuleSpecialDrag = item.Table.Columns.Contains("ModuleSpecialDrag") && !string.IsNullOrEmpty(item["ModuleSpecialDrag"] + "") ? "1".Equals(item["ModuleSpecialDrag"] + "") : false;
Instance.ViewPwd = item.Table.Columns.Contains("ViewPwd") && !string.IsNullOrEmpty(item["ViewPwd"] + "") ? "1".Equals(item["ViewPwd"] + "") : false;
Instance.LoginAnnouncement = item.Table.Columns.Contains("LoginAnnouncement") && !string.IsNullOrEmpty(item["LoginAnnouncement"] + "") ? "1".Equals(item["LoginAnnouncement"] + "") : false;
Instance.PromptDeadlock = item.Table.Columns.Contains("PromptDeadlock") && !string.IsNullOrEmpty(item["PromptDeadlock"] + "") ? "1".Equals(item["PromptDeadlock"] + "") : false;
Instance.AuditChangeRecord = item.Table.Columns.Contains("AuditChangeRecord") && !string.IsNullOrEmpty(item["AuditChangeRecord"] + "") ? "1".Equals(item["AuditChangeRecord"] + "") : false;
Instance.IsInsertWorksheet = item.Table.Columns.Contains("IsInsertWorksheet") && !string.IsNullOrEmpty(item["IsInsertWorksheet"] + "") ? "1".Equals(item["IsInsertWorksheet"] + "") : false;
}
/// <summary>
/// 高拍仪AccessKey
@@ -1090,4 +1092,12 @@ namespace Lskj.Business
/// </summary>
public string CDSBLimsPrivateKey;
/// <summary>
/// 流转记录sql不拼
/// 流转记录sql不拼接flowSource(目前只对单据生效)
/// 2026-2-26 朱萌反应加上 and flowSource='模块号' 查不出数据,确认加字段限制这个条件
/// </summary>
public bool CancelFlowSource;
/// <summary>
/// 空白单元格添加颜色(设置了单元格颜色和行颜色,都会进入单元格绘制的事件,空白单元格不会设置颜色)
/// </summary>
public bool isBlankCellColor;