SVN r926

SVN-Revision: r926

插件库/Lskj.Model/BillModel.cs

@@ -399,7 +399,14 @@ namespace Lskj.Model
         /// 刷新选中的附加明细（默认单击主表明细行时，刷新下方全部附加明细）
         /// </summary>
         public bool RefreshSelectedDetail;
-
+        /// <summary>
+        ///初始化后自动切换到指定页签并搜索的页签id
+        /// </summary>
+        public string InitialRefreshId;
+        /// <summary>
+        ///旧版分配 不判断是否为分配后的数据
+        /// </summary>
+        public bool IgnoreAllocated;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="BillModel"/> class.
@@ -478,4 +485,6 @@ namespace Lskj.Model
             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".Equals(rowItem["DisableSubmitPrompt"] + "") : false;
-            this.AttachmentRefreshMain = rowItem.Table.Columns.Contains("AttachmentRefreshMain") ? "1".E
+            this.AttachmentRefreshMain = rowItem.Table.Columns.Contains("AttachmentRefreshMain") ? "1".Equals(rowItem["AttachmentRefreshMain"] + "") : false;
+            this.CodeExecuteSql = rowItem.Table.Columns.Contains("CodeExecuteSql") ? rowItem["CodeExecuteSql"] + "" : "";
+            this.CodeExecuteParameter = rowItem.Table.Columns.Contains("CodeExecuteParameter

插件库/Lskj.Model/DynamicModel.cs

@@ -2579,4 +2579,63 @@ namespace Lskj.Model
         public string idValue;
         /// <summary>
         /// 配置关联sql
-        //
+        /// </summary>
+        /// <param name="args"></param>
+        public string ControlSql;
+        public DynamicPubInvokeExeModel(string[] args)
+            : base(args)
+        {
+            if (!string.IsNullOrEmpty(args[5]))
+            {
+                base.ModuleId = Convert.ToInt32(args[5]);
+            }
+            if (args.Length > 5)
+            {
+                this.ModuleCode = args[6];
+            }
+            if (args.Length > 6)
+            {
+                this.ControlSql = args[7];
+            }
+        }
+    }
+    /// <summary>
+    /// 凭证推送参数
+    /// </summary>
+    public class DynamicVoucher : DynamicModel
+    {
+        /// <summary>
+        /// planListid
+        /// </summary>
+        public string planlistid;
+        public DynamicVoucher(string[] args)
+            : base(args)
+        {
+            //if (!string.IsNullOrEmpty(args[5]))
+            //{
+            //    base.ModuleCode = args[5];
+            //}
+
+        }
+    }
+
+
+    public class DynamicFrmProductSchedModel : DynamicModel
+    {
+        public override string[] OtherParams()
+        {
+            return this.Params;
+        }
+        /// <summary>
+        /// 初始化默认参数(1.标题、2、用户ID、3.用户名、4.权限、5.模块编号、6.菜单ID)
+        /// </summary>
+        /// <param name="args">The arguments.</param>
+        public DynamicFrmProductSchedModel(string[] args)
+            : base(args)
+        {
+            // 右键菜单打开的模块没有moduleId,部分特殊模块没有moduleId比如添加界面.
+            if (!string.IsNullOrEmpty(args[5]))
+            {
+                base.ModuleId = Convert.ToInt32(args[5]);
+            }
+            if (args.

插件库/Lskj.Model/ModuleModel.cs

@@ -991,6 +991,15 @@ namespace Lskj.Model
         ///初始化后默认触发左侧表格点击事件
         /// </summary>
         public bool DefaultClickLeft;
+        /// <summary>
+        /// 刷新明细的序号（排产模块）
+        /// </summary>
+        public string DetaiTabControl;
+        /// <summary>
+        /// pubadd点击附件管理，url拼接树节点id
+        /// </summary>
+        public bool AttachmentSelectNode;
+
 
         #endregion
         /// <summary>
@@ -1161,4 +1170,6 @@ namespace Lskj.Model
             this.DynamicPrompt = rowItem.Table.Columns.Contains("DynamicPrompt") ? "1".Equals(rowItem["DynamicPrompt"] + "") : false;
             this.IgnoreMainload = rowItem.Table.Columns.Contains("IgnoreMainload") ? "1".Equals(rowItem["IgnoreMainload"] + "") : false;
             this.PromptFontSize = rowItem.Table.Columns.Contains("PromptFontSize") && !string.IsNullOrEmpty(rowItem["PromptFontSize"] + "") ? Convert.ToInt32(rowItem["PromptFontSize"] + "") : 12;
-            this.PromptForceColor = rowItem.Table.Col
+            this.PromptForceColor = rowItem.Table.Columns.Contains("PromptForceColor") ? rowItem["PromptForceColor"] + "" : "";
+            this.leftprimFile = rowItem.Table.Columns.Contains("leftprimFile") ? rowItem["leftprimFile"] + "" : "";
+            this.TreeKeyFieldName = rowItem.Table.Columns.Contains("TreeKeyFieldName") ?