SVN r967

SVN-Revision: r967

插件库/Lskj.Model/BillModel.cs

@@ -407,6 +407,10 @@ namespace Lskj.Model
         ///旧版分配 不判断是否为分配后的数据
         /// </summary>
         public bool IgnoreAllocated;
+        /// <summary>
+        ///单据来源控件FieldName（设置后界面上不显示来源和来源明细）
+        /// </summary>
+        public string BillSourceControlName;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="BillModel"/> class.
@@ -487,4 +491,7 @@ namespace Lskj.Model
             this.DisableSubmitPrompt = rowItem.Table.Columns.Contains("DisableSubmitPrompt") ? "1".Equals(rowItem["DisableSubmitPrompt"] + "") : false;
             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
+            this.CodeExecuteParameter = rowItem.Table.Columns.Contains("CodeExecuteParameter") ? rowItem["CodeExecuteParameter"] + "" : "";
+            //this.CenterMain = rowItem.Table.Columns.Contains("CenterMain") ? "1".Equals(rowItem["CenterMain"] + "") : false;
+            this.ScanCodeModuleCode = rowItem.Table.Columns.Contains("ScanCodeModuleCode") ? rowItem["ScanCodeModuleCode"] + "" : "";
+            t

插件库/Lskj.Model/ModuleModel.cs

@@ -999,6 +999,14 @@ namespace Lskj.Model
         /// pubadd点击附件管理，url拼接树节点id
         /// </summary>
         public bool AttachmentSelectNode;
+        /// <summary>
+        /// 扫码sql
+        /// </summary>
+        public string SweepCodeSql;
+        /// <summary>
+        ///点击回车键，焦点单元格向下移动
+        /// </summary>
+        public bool EnterToNextRow;
 
 
         #endregion
@@ -1172,4 +1180,6 @@ namespace Lskj.Model
             this.PromptFontSize = rowItem.Table.Columns.Contains("PromptFontSize") && !string.IsNullOrEmpty(rowItem["PromptFontSize"] + "") ? Convert.ToInt32(rowItem["PromptFontSize"] + "") : 12;
             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") ? 
+            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