diff --git a/插件库/Lskj.PubBill/BillModule.cs b/插件库/Lskj.PubBill/BillModule.cs
index b6c3700..85bde45 100644
--- a/插件库/Lskj.PubBill/BillModule.cs
+++ b/插件库/Lskj.PubBill/BillModule.cs
@@ -6300,7 +6300,8 @@ namespace Lskj.PubBill
                             DataTable details = BillImpl.GetDataTableResult(ReplaceHelper.ReplaceRowParam(rowItem, unionModel.ModelObj.DetailSql));
                             if (unionModel.ModelObj.sourceDetailType != "1" && unionModel.GridDetailControlObj.GridView != null && rowIndex == FocuseIndex)
                             {
-                                details = unionModel.GridDetailControlObj.GridView.GetGridViewFilteredAndSortedDataToDataTable();
+                                //details = unionModel.GridDetailControlObj.GridView.GetGridViewFilteredAndSortedDataToDataTable();
+                                details = unionModel.GridDetailControlObj.GridControl.DataSource as DataTable;
                             }
                             else if (unionModel.ModelObj.sourceDetailType == "1" && unionModel.TreeGridDetailControlObj.TreeListObj != null && rowIndex == FocuseIndex)
                             {
@@ -6310,12 +6311,29 @@ namespace Lskj.PubBill
                             //DataTable details = unionModel.GridDetailControlObj.GridView.DataController.GetAllFilteredAndSortedRows().OfType<DataRow>().CopyToDataTable();
                             this.ControlObj.SetAllControlValue(rowItem, true);
 
-
-
                             if (unionModel.ModelObj.CadDragDetail)
                             {
                                 this.AddMultiRowToGridView(details, unionModel);
                             }
+
+                            if (BillModel.drgFinishHide == "1" && unionModel.GridDetailControlObj != null)
+                            {
+                                var detailRows = details.AsEnumerable().ToList();
+                                foreach (var detailRow in detailRows)
+                                {
+                                    if (unionModel.GridDetailControlObj.GridControl.DataSourceTable().Rows.IndexOf(detailRow) >= 0)
+                                    {
+                                        unionModel.GridDetailControlObj.GridControl.DataSourceTable().Rows.Remove(detailRow);
+                                        //RemoveRowitem.Add(rowItem);
+                                    }
+                                    if (unionModel.GridDetailDetailControlObj != null && unionModel.GridDetailDetailControlObj.GridControl.DataSourceTable().Rows.IndexOf(detailRow) >= 0)
+                                    {
+                                        unionModel.GridDetailDetailControlObj.GridControl.DataSourceTable().Rows.Remove(detailRow);
+                                        //RemoveRowitem.Add(rowItem);
+                                    }
+                                }
+                            }
+
                             //单据为新增状态，根据最后一行的内容设置红蓝单据
                             if (!this.BillModel.SaveState && rows.Length - 1 == i && rowItem.Table.Columns.Contains(this.BillModel.RtagidKey) && this.BillModel.BillFlag != 0 && this.BillModel.BillFlag != 1)
                             {