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

SVN r792

Browse Source 
SVN-Revision: r792
This commit is contained in:
cyf
2025-06-26 10:28:53 +00:00
parent 33dc032844
commit 3b5c814bef
4 changed files with 35 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
插件库/Lskj.Model/BillModel.cs
+21 -2
View File
@@ -363,7 +363,7 @@ namespace Lskj.Model
/// </summary>
public bool DisableSubmitPrompt;
/// <summary>
/// 下方附件模块修改后是否刷新主表和主表明细
/// 下方附加模块修改后是否刷新主表和主表明细
/// </summary>
public bool AttachmentRefreshMain;
/// <summary>
@@ -374,6 +374,22 @@ namespace Lskj.Model
/// 扫码执行的存储过程参数
/// </summary>
public string CodeExecuteParameter;
/// <summary>
/// 主表居中(只对Lskj.PubBillSpecial生效)
/// </summary>
//public bool CenterMain;
/// <summary>
/// 扫码后打开的串码模块
/// </summary>
public string ScanCodeModuleCode;
/// <summary>
/// 扫码时，条码前缀（满足前缀就直接执行存储过程）
/// </summary>
public string ScanCodeFixedPrefix;
/// <summary>
/// 右侧表格模块号
/// </summary>
public string RightModuleCode;
/// <summary>
@@ -448,4 +464,7 @@ namespace Lskj.Model
this.LoadFilter = columns.Contains("LoadFilter") && !string.IsNullOrEmpty(rowItem["LoadFilter"] + "") ? "1".Equals(rowItem["LoadFilter"] + "") : false;
this.MainVerticalScroll = columns.Contains("MainVerticalScroll") && !string.IsNullOrEmpty(rowItem["MainVerticalScroll"] + "") ? "1".Equals(rowItem["MainVerticalScroll"] + "") : false;
this.MainHorizontalScrolling = columns.Contains("MainHorizontalScrolling") && !string.IsNullOrEmpty(rowItem["MainHorizontalScrolling"] + "") ? "1".Equals(rowItem["MainHorizontalScrolling"] + "") : false;
this.DisableFieldSources = rowItem.Table.Columns.Contains("DisableFieldSources") ? "1".Equals(rowItem["DisableFieldSources"] + "") : false;
this.BeforeBillSaveExec = rowItem.Table.Columns.Contains("BeforeBillSaveExec") ? rowItem["BeforeBillSaveExec"] + "" : "";
this.DisableDragPrompt = rowItem.Table.Columns.Contains("DisableDragPrompt") ? "1".Equals(rowItem["DisableDragPrompt"] + "") : false;
this.DisableSubmitPrompt = rowItem.Table.Columns.Contains("DisableSubmitPrompt") ? "1"
插件库/Lskj.Model/ERPInfo.cs
+2 -40
View File
@@ -106,6 +106,7 @@ namespace Lskj.Model
/// 是否阻止回车事件
/// </summary>
public bool IsExecute = false;
/// <summary>
/// 登录IP
@@ -405,43 +406,4 @@ namespace Lskj.Model
else
{
systemVersion = "非Windows NT系列操作系统";
}
return systemVersion;
}
}
#endregion
/// <summary>
/// 使用winfrom自带浏览器
/// </summary>
public bool PrimitiveBrowser;
/// <summary>
/// 当前程序使用的语言
/// </summary>
public string LanguageName;
/// <summary>
/// 是否改变存储过程参数类型（越南语要用Nvarchar）
/// </summary>
public bool ChangeParameterType
{
get
{
if (!string.IsNullOrWhiteSpace(this.LanguageName))
{
return true;
}
return false;
}
}
/// <summary>
/// 页面水印层
/// </summary>
public Form WatermarkForm;
}
}
插件库/Lskj.Model/ModuleModel.cs
+6 -1
View File
@@ -971,6 +971,10 @@ namespace Lskj.Model
/// 是否隐藏附件按钮
/// </summary>
public bool HideAttachBtn;
///<summary>
/// 向表格粘贴数据时，不处理\t（tab键）
/// </summary>
public bool IgnoreTab;
#endregion
/// <summary>
@@ -1136,4 +1140,5 @@ namespace Lskj.Model
this.ExportNameWithoutDate = rowItem.Table.Columns.Contains("ExportNameWithoutDate") ? "1".Equals(rowItem["ExportNameWithoutDate"] + "") : false;
this.DynamicColumnNameSql = rowItem.Table.Columns.Contains("DynamicColumnNameSql") ? rowItem["DynamicColumnNameSql"] + "" : string.Empty;
this.AfterSaveExec = rowItem.Table.Columns.Contains("AfterSaveExec") ? rowItem["AfterSaveExec"] + "" : string.Empty;
this.IncomingSetCondition = rowItem.Table.Columns.Contains("IncomingSetCondition") ? "1".Equals(rowItem["IncomingSetCondi
this.IncomingSetCondition = rowItem.Table.Columns.Contains("IncomingSetCondition") ? "1".Equals(rowItem["IncomingSetCondition"] + "") : false;
this.DynamicPrompt = rowItem.Table.Columns.Contains("DynamicPrompt") ? "1".Equals(rowIte
插件库/Lskj.Model/WaterMark.cs
+6 -22
View File
@@ -13,6 +13,7 @@ using System.Linq;
using System.Text;
using System.Data;
namespace Lskj.Model
{
/// <summary>
@@ -44,6 +45,10 @@ namespace Lskj.Model
{
// 设置为草稿
this.Text = "草 稿";
if (!string.IsNullOrWhiteSpace(ERPInfo.Instance.DraftReplacementValue))
{
this.Text = ERPInfo.Instance.DraftReplacementValue;
}
}
else
{
@@ -69,25 +74,4 @@ namespace Lskj.Model
{
this.Text = "在 审";
}
else if (columns.Contains(prefix + "affirmer") && ("0" != rowItem[prefix + "affirmer"] + "" && !string.IsNullOrEmpty(rowItem[prefix + "affirmer"] + "")))
{
this.Text = "待 审";
}
else
{
this.Text = "草 稿";
}
// 设置打印文本
if (columns.Contains(prefix + "printCount"))
{
this.Print = "打印" + (string.IsNullOrEmpty(rowItem[prefix + "printCount"] + "") ? "0次" : rowItem[prefix + "printCount"] + "次");
}
// 设置收款文本
if (columns.Contains(prefix + "collectMoneyFlag") && "1".Equals(rowItem[prefix + "collectMoneyFlag"] + ""))
{
this.Collect = "已收款";
}
}
}
}
}
else if (columns.Contains(prefix + "affirmer") && ("0" != rowItem[prefix + "affirmer"] + "" && !string.IsNullOrEmpt