SVN r1139

SVN-Revision: r1139

插件库/Lskj.Model/BillModel.cs

@@ -64,12 +64,12 @@ namespace Lskj.Model
         /// 操作区域宽度
         /// </summary>
         /// <value>The width of the panel.</value>
-        public int PanelWidth { get; private set; }
+        public int PanelWidth { get;  set; }
         /// <summary>
         /// 操作区域高度
         /// </summary>
         /// <value>The height of the panel.</value>
-        public int PanelHeight { get; private set; }
+        public int PanelHeight { get;  set; }
         /// <summary>
         /// Gets the height of the parent.
         /// </summary>
@@ -427,6 +427,10 @@ namespace Lskj.Model
         ///取消复制表头后的触发关联（默认触发，设置为1不触发）
         /// </summary>
         public bool CancelCopyAssociation;
+        /// <summary>
+        ///打印按钮交互条件
+        /// </summary>
+        public string  PrintingConditions;
 
 
 
@@ -516,4 +520,5 @@ namespace Lskj.Model
             this.RightModuleCode = rowItem.Table.Columns.Contains("RightModuleCode") ? rowItem["RightModuleCode"] + "" : "";
             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
+            this.IgnoreAllocated = rowItem.Table.Columns.Contains("IgnoreAllocated") ? "1".Equals(rowItem["IgnoreAllocated"] + "") : false;
+            this.BillSourceControlName = rowItem.Table.Col

插件库/Lskj.Model/DynamicModel.cs

@@ -537,6 +537,10 @@ namespace Lskj.Model
         /// 单据上方名称
         /// </summary>
         public string DocumentName;
+        /// <summary>
+        /// 是否隐藏来源和来源明细
+        /// </summary>
+        public bool HideSource;
 
         /// <summary>
         /// <para>说明：传入特殊参数处理</para>
@@ -580,6 +584,10 @@ namespace Lskj.Model
             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;
+            if (args.Length > 17) 
+            {
+                HideSource = "1".Equals(args[17] + "");
+            }
         }
     }
     /// <summary>
@@ -2533,6 +2541,11 @@ namespace Lskj.Model
         /// 显示模式，如果为1则隐藏配置界面
         /// </summary>
         public string ShowType = "";
+        /// <summary>
+        /// 绑定程序列是单据还是单表（为1是单表）
+        /// </summary>
+        public string isBase = "";
+
         public DynamicPubSpecialImport(string[] args)
             : base(args)
         {
@@ -2570,6 +2583,10 @@ namespace Lskj.Model
             {
                 ShowType = args[12] + "";
             }
+            if (args.Length > 13 && !string.IsNullOrWhiteSpace(args[13]))
+            {
+                isBase = args[13] + "";
+            }
         }
     }
     /// <summary>

插件库/Lskj.Model/ModuleModel.cs

@@ -1031,6 +1031,12 @@ namespace Lskj.Model
         ///是否关联左侧模块(只对排产模块生效)
         /// </summary>
         public bool AssociateLeft;
+        /// <summary>
+        ///保存后提交（pubadd中，点击提交保存成功后询问是否提交）
+        /// </summary>
+        public bool AddAndSubmit;
+
+
 
         #endregion
         /// <summary>
@@ -1211,4 +1217,5 @@ namespace Lskj.Model
             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"] + "" : "
+            this.SweepCodeSql = rowItem.Table.Columns.Contains("SweepCodeSql") ? rowItem["SweepCodeSql"] + "" : "";
+            this.EnterToNextRow = rowItem.Table.Columns.Contains("EnterToNextRow") ? "1".Equals(rowItem["EnterToNextRow"] + "")