From 68cc9cc7b1811f5fc3d753948c4d6f37bb83b41f Mon Sep 17 00:00:00 2001
From: cyf <cyf@local>
Date: Fri, 26 Jun 2026 09:37:02 +0000
Subject: [PATCH] SVN r1240

SVN-Revision: r1240
---
 插件库/Lskj.PubBill/BillModule.cs | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/插件库/Lskj.PubBill/BillModule.cs b/插件库/Lskj.PubBill/BillModule.cs
index c217df1..1c9bd16 100644
--- a/插件库/Lskj.PubBill/BillModule.cs
+++ b/插件库/Lskj.PubBill/BillModule.cs
@@ -1828,6 +1828,7 @@ namespace Lskj.PubBill
                 {
                     this.tb_buttom.OnDetailSaveGridCallBack += Tab_OnDetailSaveGridCallBack;
                 }
+                this.tb_buttom.BillDetailRightGridCallBack += Tab_OnDetailSaveGridCallBack;//OnMrpBtnClickCallback
                 if (this.BillModel.RefreshSelectedDetail)
                 {
                     //配置了只刷新当前页签后，切换页签时刷新
@@ -4448,6 +4449,7 @@ namespace Lskj.PubBill
                                     }
                                     else if (!string.IsNullOrEmpty(model.DefaultValue))
                                     {
+
                                         if (string.IsNullOrEmpty(newRow[col.FieldName] + "") || this.BillModel.DragFixedDefault)
                                         {
                                             newRow[col.FieldName] = fieldValue;
@@ -5543,8 +5545,7 @@ namespace Lskj.PubBill
                                 // 继续执行保存
                                 if (string.IsNullOrWhiteSpace(tipMsg)) tipMsg = "保存单据临时表失败";
                                 if (MessageUtil.Show(tipMsg, MessageBoxButtons.YesNo) == DialogResult.Yes)
-                                    this.BillSave(1, canTipMsg);
-                                saveResult = true;
+                                    saveResult = this.BillSave(1, canTipMsg);
                                 break;
                             default:
                                 // 保存失败
@@ -7145,8 +7146,14 @@ 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.GridControl.DataSource as DataTable;
+                                if (SystemInfo.Instance.SourceFilteringMobile)
+                                {
+                                    details = unionModel.GridDetailControlObj.GridView.GetGridViewFilteredAndSortedDataToDataTable();
+                                }
+                                else
+                                {
+                                    details = unionModel.GridDetailControlObj.GridControl.DataSource as DataTable;
+                                }
                             }
                             else if (unionModel.ModelObj.sourceDetailType == "1" && unionModel.TreeGridDetailControlObj.TreeListObj != null && rowIndex == FocuseIndex)
                             {
@@ -9199,7 +9206,14 @@ 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();
+                                if (SystemInfo.Instance.SourceFilteringMobile)
+                                {
+                                    details = unionModel.GridDetailControlObj.GridView.GetGridViewFilteredAndSortedDataToDataTable();
+                                }
+                                else
+                                {
+                                    details = unionModel.GridDetailControlObj.GridControl.DataSource as DataTable;
+                                }
                             }
                             else if (unionModel.ModelObj.sourceDetailType == "1" && unionModel.TreeGridDetailControlObj.TreeListObj != null && rowIndex == FocuseIndex)
                             {
@@ -9996,7 +10010,7 @@ namespace Lskj.PubBill
                 string condition = CondItem["condition"] + "";
                 if (!string.IsNullOrWhiteSpace(condition))
                 {
-                   
+
                     if (detailTable != null && detailTable.Rows.Count > 0)
                     {
                         condition = this.ControlObj.ReplaceParentControlValue(condition);
@@ -10005,4 +10019,4 @@ namespace Lskj.PubBill
                             if (!ValidateCond(condition, item))
                             {
                                 MessageUtil.Show(string.IsNullOrWhiteSpace(CondItem["hintmsg"] + "") ? "条件验证失败" : CondItem["hintmsg"] + "");
-                                r
\ No newline at end of file
+                               
\ No newline at end of file