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

SVN r1106

Browse Source 
SVN-Revision: r1106
This commit is contained in:
cyf
2026-01-30 07:52:21 +00:00
parent 0027b1714e
commit 52221cc693
7 changed files with 112 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
插件库/Lskj.Model/AccraditationModel.cs
+15 -1
View File
@@ -109,4 +109,18 @@ namespace Lskj.Model
this.StepBackText = string.IsNullOrEmpty(dr["stepBackText"] + "") ? "回退" : dr["stepBackText"] + "";
this.StepCode = dr["stepCode"] + "";
this.StepDivide = dr.Table.Columns.Contains("stepDivide") ? Convert.ToInt32(string.IsNullOrEmpty(dr["stepDivide"] + "") ? "0" : dr["stepDivide"] + "") : 0;
this.StepCloseText = columns.Contains("stepCloseText") && string.IsNullOrEmpty(dr["stepCloseTex
this.StepCloseText = columns.Contains("stepCloseText") && string.IsNullOrEmpty(dr["stepCloseText"] + "") ? "关闭" : dr["stepCloseText"] + "";
this.StepCloseTip = columns.Contains("stepCloseTip") ? dr["stepCloseTip"] + "" : "";
this.StepSql = columns.Contains("stepSql") ? dr["stepSql"] + "" : "";
this.BillModifyFields = dr["billModifyFields"] + "";
this.SuggestionSql = "select Mix_apellation from P_BaseMixInfoTab a where a.Tag ='1201'";
this.FlowOperSql = "select object_id('p_baseflowoperex')";
this.DetailModifyFields = dr["detailModifyFields"] + "";
this.RequiredFields = columns.Contains("requiredFields") ? dr["requiredFields"] + "" : string.Empty;
this.RequiredDetailFields = columns.Contains("requiredDetailFields") ? dr["requiredDetailFields"] + "" : string.Empty;
this.StepApplyContent = columns.Contains("StepApplyContent") ? dr["StepApplyContent"] + "" : string.Empty;
this.Formkey = columns.Contains("Formkey") ? dr["Formkey"] + "" : string.Empty;
}
}
}
插件库/Lskj.Model/BaseAccraditationModel.cs
+1 -4
View File
@@ -8,9 +8,6 @@
* 版本：1.0.0.0
**********************************/
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Data;
namespace Lskj.Model
@@ -147,4 +144,4 @@ namespace Lskj.Model
this.FormKey=rowItem["formkey"]+"";
this.OverBackOper = rowItem["overbackoper"] + "";
this.OverBackCond = rowItem["overbackcond"] + "";
this.OverBackSql = rowItem["overback
this.OverBackSql = rowItem["overba
插件库/Lskj.Model/BillModel.cs
+13 -1
View File
@@ -419,6 +419,16 @@ namespace Lskj.Model
///是否固定替换（默认为true，主表中固定后缀的控件会替换为固定的默认值）
/// </summary>
public bool isReplaceFixed;
/// <summary>
///保存后刷新下方附加明细
/// </summary>
public bool SaveRefreshAdditional;
/// <summary>
///取消复制表头后的触发关联（默认触发，设置为1不触发）
/// </summary>
public bool CancelCopyAssociation;
/// <summary>
/// Initializes a new instance of the <see cref="BillModel"/> class.
@@ -504,4 +514,6 @@ namespace Lskj.Model
this.ScanCodeModuleCode = rowItem.Table.Columns.Contains("ScanCodeModuleCode") ? rowItem["ScanCodeModuleCode"] + "" : "";
this.ScanCodeFixedPrefix = rowItem.Table.Columns.Contains("ScanCodeFixedPrefix") ? rowItem["ScanCodeFixedPrefix"] + "" : "";
this.RightModuleCode = rowItem.Table.Columns.Contains("RightModuleCode") ? rowItem["RightModuleCode"] + "" : "";
this.RefreshSelectedDe
this.RefreshSelectedDetail = rowItem.Table.Columns.Contains("RefreshSelectedDetail") ? "1".Equals(rowItem["RefreshSelectedDetail"] + "") : false;
this.InitialRefreshId = rowItem.Table.Columns.Contains("InitialRefreshId") ? rowItem["InitialRefreshId"] + "" : "";
this.IgnoreAllocated = rowItem.Table.Columns.Contain
插件库/Lskj.Model/DynamicModel.cs
+5 -1
View File
@@ -533,7 +533,10 @@ namespace Lskj.Model
/// 显示来源明细id（不配置就显示全部）
/// </summary>
public string SourceDetailsID;
/// <summary>
/// 单据上方名称
/// </summary>
public string DocumentName;
/// <summary>
/// <para>说明：传入特殊参数处理</para>
@@ -576,6 +579,7 @@ namespace Lskj.Model
this.BillDetailSql = args.Length > 13 ? args[13] : string.Empty;
this.BillOrderNo = args.Length > 14 ? args[14] : string.Empty;
this.SourceDetailsID = args.Length > 15 ? args[15] : string.Empty;
this.DocumentName = args.Length > 16 ? args[16] : string.Empty;
}
}
/// <summary>
插件库/Lskj.Model/ERPInfo.cs
+29 -1
View File
@@ -416,4 +416,32 @@ 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;
}
插件库/Lskj.Model/ModuleModel.cs
+33 -4
View File
@@ -105,7 +105,7 @@ namespace Lskj.Model
get { return _preSQL; }
}
/// <summary>
/// 多表头显示模式
///模块编号
/// </summary>
/// <value>The menu dir identifier.</value>
public string ModeCode
@@ -539,7 +539,7 @@ namespace Lskj.Model
public string RefreshSql;
/// <summary>
/// 拖拽调用到的存储过程名
/// 拖拽调用到的左侧列名
/// </summary>
/// <value>The menu table.</value>
public string leftprimFile;
@@ -1007,7 +1007,30 @@ namespace Lskj.Model
///点击回车键，焦点单元格向下移动
/// </summary>
public bool EnterToNextRow;
/// <summary>
/// 聚合界面是否冻结基本信息列（默认冻结，设置为1不冻结）
/// </summary>
public bool AggregationFreeze;
/// <summary>
/// 点击末级节点刷新数据（智能建档模块）
/// </summary>
public bool LeafNodeRefresh;
/// <summary>
/// 是否可以拖拽到左侧（PubModelAdd3）
/// </summary>
public bool DragToLeft;
/// <summary>
/// 右侧不默认拼接左侧条件（ProductiSched）
/// </summary>
public bool CancelDefaultConditions;
/// <summary>
///导入时触发关联计算(模块控制)
/// </summary>
public bool AutoImportCalMode;
/// <summary>
///是否关联左侧模块(只对排产模块生效)
/// </summary>
public bool AssociateLeft;
#endregion
/// <summary>
@@ -1182,4 +1205,10 @@ namespace Lskj.Model
this.leftprimFile = rowItem.Table.Columns.Contains("leftprimFile") ? rowItem["leftprimFile"] + "" : "";
this.TreeKeyFieldName = rowItem.Table.Columns.Contains("TreeKeyFieldName") ? rowItem["TreeKeyFieldName"] + "" : "";
this.TreeParentFieldName = rowItem.Table.Columns.Contains("TreeParentFieldName") ? rowItem["TreeParentFieldName"] + "" : "";
this.HideAttachBtn = rowItem.Table.Columns.Contains("HideAttachBt
this.HideAttachBtn = rowItem.Table.Columns.Contains("HideAttachBtn") ? "1".Equals(rowItem["HideAttachBtn"] + "") : false;
this.IgnoreTab = rowItem.Table.Columns.Contains("IgnoreTab") ? "1".Equals(rowItem["IgnoreTab"] + "") : false;
this.LeftTreeKeyFieldName = rowItem.Table.Columns.Contains("LeftTreeKeyFieldName") ? rowItem["LeftTreeKeyFieldName"] + "" : "";
this.DefaultClickLeft = rowItem.Table.Columns.Contains("DefaultClickLeft") ? "1".Equals(rowItem["DefaultClickLeft"] + "") : false;
this.DetaiTabControl = rowItem.Table.Columns.Contains("DetaiTabControl") ? rowItem["DetaiTabControl"] + "" : "";
this.AttachmentSelectNode = rowItem.Table.Columns.Contains("AttachmentSelectNode") ? "1".Equals(rowItem["AttachmentSelectNode"] + "") : false;
this.SweepCodeSql = rowItem.Table.Columns.Contains("SweepCodeSql") ? rowItem["SweepCodeSql"] + "" : "
插件库/Lskj.Model/WaterMark.cs
+16 -1
View File
@@ -74,4 +74,19 @@ namespace Lskj.Model
{
this.Text = "在 审";
}
else if (columns.Contains(prefix + "affirmer") && ("0" != rowItem[prefix + "affirmer"] + "" && !string.IsNullOrEmpt
else if (columns.Contains(prefix + "affirmer") && ("0" != rowItem[prefix + "affirmer"] + "" && !string.IsNullOrEmpty(rowItem[prefix + "affirmer"] + "")))
{
this.Text = "待 审";
}
else
{
this.Text = "草 稿";
if (!string.IsNullOrWhiteSpace(ERPInfo.Instance.DraftReplacementValue))
{
this.Text = ERPInfo.Instance.DraftReplacementValue;
}
}
// 设置打印文本
if (columns.Contains(prefix + "printCount"))
{
this.Print = "打印" + (string.IsNullOrEmpty(rowItem[prefix + "printCount"] + "") ? "0次" : rowItem[prefix + "printCount"] + "