diff --git a/插件库/Lskj.Model/AccraditationModel.cs b/插件库/Lskj.Model/AccraditationModel.cs
index caf4681..8add50f 100644
--- a/插件库/Lskj.Model/AccraditationModel.cs
+++ b/插件库/Lskj.Model/AccraditationModel.cs
@@ -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
\ No newline at end of file
+ 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;
+
+ }
+ }
+}
diff --git a/插件库/Lskj.Model/BaseAccraditationModel.cs b/插件库/Lskj.Model/BaseAccraditationModel.cs
index cc4d0ac..3945561 100644
--- a/插件库/Lskj.Model/BaseAccraditationModel.cs
+++ b/插件库/Lskj.Model/BaseAccraditationModel.cs
@@ -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
\ No newline at end of file
+ this.OverBackSql = rowItem["overba
\ No newline at end of file
diff --git a/插件库/Lskj.Model/BillModel.cs b/插件库/Lskj.Model/BillModel.cs
index 2af79ab..e7a0907 100644
--- a/插件库/Lskj.Model/BillModel.cs
+++ b/插件库/Lskj.Model/BillModel.cs
@@ -419,6 +419,16 @@ namespace Lskj.Model
///是否固定替换（默认为true，主表中固定后缀的控件会替换为固定的默认值）
///
public bool isReplaceFixed;
+ ///
+ ///保存后刷新下方附加明细
+ ///
+ public bool SaveRefreshAdditional;
+ ///
+ ///取消复制表头后的触发关联（默认触发，设置为1不触发）
+ ///
+ public bool CancelCopyAssociation;
+
+
///
/// Initializes a new instance of the 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
\ No newline at end of file
+ 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
\ No newline at end of file
diff --git a/插件库/Lskj.Model/DynamicModel.cs b/插件库/Lskj.Model/DynamicModel.cs
index eb1a711..83fb3c6 100644
--- a/插件库/Lskj.Model/DynamicModel.cs
+++ b/插件库/Lskj.Model/DynamicModel.cs
@@ -533,7 +533,10 @@ namespace Lskj.Model
/// 显示来源明细id（不配置就显示全部）
///
public string SourceDetailsID;
-
+ ///
+ /// 单据上方名称
+ ///
+ public string DocumentName;
///
/// 说明：传入特殊参数处理
@@ -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;
}
}
///
diff --git a/插件库/Lskj.Model/ERPInfo.cs b/插件库/Lskj.Model/ERPInfo.cs
index fd1048a..b7757e4 100644
--- a/插件库/Lskj.Model/ERPInfo.cs
+++ b/插件库/Lskj.Model/ERPInfo.cs
@@ -416,4 +416,32 @@ namespace Lskj.Model
else
{
systemVersion = "非Windows NT系列操作系统";
-
\ No newline at end of file
+ }
+ return systemVersion;
+ }
+ }
+ #endregion
+
+ ///
+ /// 使用winfrom自带浏览器
+ ///
+ public bool PrimitiveBrowser;
+
+ ///
+ /// 当前程序使用的语言
+ ///
+ public string LanguageName;
+
+ ///
+ /// 是否改变存储过程参数类型（越南语要用Nvarchar）
+ ///
+ public bool ChangeParameterType
+ {
+ get
+ {
+ if (!string.IsNullOrWhiteSpace(this.LanguageName))
+ {
+ return true;
+ }
+ return false;
+ }
\ No newline at end of file
diff --git a/插件库/Lskj.Model/ModuleModel.cs b/插件库/Lskj.Model/ModuleModel.cs
index f360f32..d5f5f44 100644
--- a/插件库/Lskj.Model/ModuleModel.cs
+++ b/插件库/Lskj.Model/ModuleModel.cs
@@ -105,7 +105,7 @@ namespace Lskj.Model
get { return _preSQL; }
}
///
- /// 多表头显示模式
+ ///模块编号
///
/// The menu dir identifier.
public string ModeCode
@@ -539,7 +539,7 @@ namespace Lskj.Model
public string RefreshSql;
///
- /// 拖拽调用到的存储过程名
+ /// 拖拽调用到的左侧列名
///
/// The menu table.
public string leftprimFile;
@@ -1007,7 +1007,30 @@ namespace Lskj.Model
///点击回车键，焦点单元格向下移动
///
public bool EnterToNextRow;
-
+ ///
+ /// 聚合界面是否冻结基本信息列（默认冻结，设置为1不冻结）
+ ///
+ public bool AggregationFreeze;
+ ///
+ /// 点击末级节点刷新数据（智能建档模块）
+ ///
+ public bool LeafNodeRefresh;
+ ///
+ /// 是否可以拖拽到左侧（PubModelAdd3）
+ ///
+ public bool DragToLeft;
+ ///
+ /// 右侧不默认拼接左侧条件（ProductiSched）
+ ///
+ public bool CancelDefaultConditions;
+ ///
+ ///导入时触发关联计算(模块控制)
+ ///
+ public bool AutoImportCalMode;
+ ///
+ ///是否关联左侧模块(只对排产模块生效)
+ ///
+ public bool AssociateLeft;
#endregion
///
@@ -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
\ No newline at end of file
+ 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"] + "" : "
\ No newline at end of file
diff --git a/插件库/Lskj.Model/WaterMark.cs b/插件库/Lskj.Model/WaterMark.cs
index 7aa47e2..6cf1354 100644
--- a/插件库/Lskj.Model/WaterMark.cs
+++ b/插件库/Lskj.Model/WaterMark.cs
@@ -74,4 +74,19 @@ namespace Lskj.Model
{
this.Text = "在 审";
}
- else if (columns.Contains(prefix + "affirmer") && ("0" != rowItem[prefix + "affirmer"] + "" && !string.IsNullOrEmpt
\ No newline at end of file
+ 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"] + "
\ No newline at end of file