提交当前本机整理版本

插件库/Lskj.PubBillSpecial/Model/BillSourceModel.cs

@@ -86,4 +86,21 @@ namespace Lskj.PubBillSpecial.Model
             this.sourceDetailType = item.Table.Columns.Contains("sourceDetailType") ? item["sourceDetailType"] + "" : "";
             this.DisableShowSourceCount = item.Table.Columns.Contains("DisableShowSourceCount") && "1".Equals(item["DisableShowSourceCount"] + "") ? true : false;
 
-            this.AddDataSql = 
+            this.AddDataSql = item.Table.Columns.Contains("AddDataSql") ? item["AddDataSql"] + "" : "";
+            this.AddDataCondition = item.Table.Columns.Contains("AddDataCondition") ? item["AddDataCondition"] + "" : "";
+
+            this.LoadFilter = item.Table.Columns.Contains("LoadFilter") && "1".Equals(item["LoadFilter"] + "") ? true : false;
+            this.DetailedLoadFilter = item.Table.Columns.Contains("DetailedLoadFilter") && "1".Equals(item["DetailedLoadFilter"] + "") ? true : false;
+            this.DetailsDoubleClick = item.Table.Columns.Contains("DetailsDoubleClick") && "1".Equals(item["DetailsDoubleClick"] + "") ? true : false;
+            this.MainDetailsAddType = item.Table.Columns.Contains("MainDetailsAddType") ?item["MainDetailsAddType"] + "":"";
+        }
+        /// <summary>
+        /// 改变来源类型
+        /// </summary>
+        /// <param name="sourceType"></param>
+        public void ChangeSourceType(int sourceType)
+        {
+            this.SourceType = sourceType;
+        }
+    }
+}

插件库/Lskj.PubBillSpecial/Model/BillSourceUnionModel.cs

@@ -35,4 +35,38 @@ namespace Lskj.PubBillSpecial.Model
         public GridControlEx GridControlObj;
         /// <summary>
         /// 单据来源表格树
-       
+        /// </summary>
+        public TreeGridControlEx TreeGridControlObj;
+        /// <summary>
+        /// 单据来源明细表格
+        /// </summary>
+        public GridControlEx GridDetailControlObj;
+        /// <summary>
+        /// 单据来源明细表格树
+        /// </summary>
+        public TreeGridControlEx TreeGridDetailControlObj;
+        /// <summary>
+        /// 单据来源查询条件
+        /// </summary>
+        public MyControl SearchObj;
+
+        /// <summary>
+        /// 单据来源明细表格的明细
+        /// </summary>
+        public GridControlEx GridDetailDetailControlObj;
+
+
+        public bool IsChange = false;
+
+        /// <summary>
+        /// 添加数据sql（来源明细添加到主表明细时，执行sql把查询数据源一并添加到来源明细中）
+        /// </summary>
+        public string AddDataSql;
+        /// <summary>
+        /// 添加数据条件
+        /// </summary>
+        public string AddDataCondition;
+
+
+    }
+}