SVN r607

SVN-Revision: r607

插件库/Lskj.PubBill/BillModule.cs

@@ -2941,7 +2941,28 @@ namespace Lskj.PubBill
         private void RefreshSource(BillSourceUnionModel unionModel = null)
         {
             if (unionModel == null || unionModel.SearchObj == null) return;
-            unionModel.SearchObj.SearchLastGrid();
+            //unionModel.SearchObj.SearchLastGrid();
+            string sql = ReplaceHelper.ReplaceUserInfo(unionModel.ModelObj.SourceSql);
+            int Handle = 0;
+            if (unionModel.GridControlObj != null) Handle = unionModel.GridControlObj.GridView.FocusedRowHandle;
+            sql = sql.Replace("#", "");
+            List<string> paramList = ReplaceHelper.GetParamFields(sql);
+            if (unionModel.SearchObj != null)
+            {
+                //sql拼接来源条件和替换主表控件值
+                sql = this.ControlObj.ReplaceControlValue(unionModel.SearchObj.SetSearchSqlValue(sql, true));
+            }
+            if (unionModel.GridControlObj != null)
+            {
+                unionModel.GridControlObj.gridControl.DataSource = BaseImpl.GetDataTableResult(sql);
+
+                if (unionModel.GridControlObj != null)
+                {
+                    unionModel.GridControlObj.GridView.SelectRowHandler(Handle);
+                    //this.RefreshSourceDetail(tabPage.Tag as BillSourceUnionModel);
+                }
+                RefreshSourceDetail(unionModel);
+            }
         }
         /// <summary>
         /// <para>说明：右边选择下拉框刷新左边来源</para>
@@ -3469,6 +3490,11 @@ namespace Lskj.PubBill
                     GridColumnModel model = col.Tag as GridColumnModel;
                     if (model == null)
                     {
+                        if (rowItem.Table.Columns.Contains(col.FieldName))
+                        {
+                            // 来源列中是否包含对应字段,包含则使用值
+                            newRow[col.FieldName] = rowItem[col.FieldName];
+                        }
                         continue;
                     }
                     if (rowItem.Table.Columns.Contains(col.FieldName))