SVN r410

SVN-Revision: r410

插件库/Lskj.PubBill/BillModule.cs

@@ -4242,7 +4242,7 @@ namespace Lskj.PubBill
         /// <para>版本：1.0</para>
         /// </summary>
         /// <returns>System.String.</returns>
-        private StringBuilder GetDetailRecord(string guid, string billNo)
+        private StringBuilder GetDetailRecord(string guid, string billNo, List<DataRow> addRowList)
         {
             // 构造明细
             StringBuilder detailBuilder = new StringBuilder();
@@ -4337,7 +4337,7 @@ namespace Lskj.PubBill
 
                         fields.Append(item.ColumnName + ",");
                         string fieldValue = dataRow.Table.Columns.Contains(item.ColumnName) ? dataRow[item.ColumnName] + "" : string.Empty;
-                        if (Autogrowcolumn.Equals(item.ColumnName))
+                        if (addRowList != null && addRowList.Contains(dataRow) && Autogrowcolumn.Equals(item.ColumnName))
                         {
                             fieldValue = "";
                         };
@@ -4400,8 +4400,9 @@ namespace Lskj.PubBill
             bool saveResult = false;
             if (this.ControlObj.VerifyNull())
             {
-                DataTable tvp = new DataTable();//虚构一个保存存储过程
-                                                //更新前进行数据源筛选
+                //虚构一个保存存储过程
+                DataTable tvp = new DataTable();
+                //更新前进行数据源筛选
                 if (DateColumnList.Count > 0)
                 {
                     // 创建临时表
@@ -4456,7 +4457,16 @@ namespace Lskj.PubBill
                         }
                     }
                 }
-
+                //记录表格状态
+                List<DataRow> addRowList = new List<DataRow>();
+                DataTable sourceTable = gcMain.GridControl.DataSourceTable();
+                foreach (DataRow dataRow in sourceTable.Rows)
+                {
+                    if (dataRow.RowState == DataRowState.Added)
+                    {
+                        addRowList.Add(dataRow);
+                    }
+                }
                 // 保存之前先进行表格更新
                 if (this.BillModel.DetailTreeTable)
                 {
@@ -4486,7 +4496,7 @@ namespace Lskj.PubBill
                         string detailGuid = Guid.NewGuid().ToString();
 
                         string masterSql = BillModel.SaveState ? GetUpdateRecord(billNo) : GetAddRecord(ref billNo);
-                        string detailSql = GetDetailRecord(detailGuid, billNo).ToString();
+                        string detailSql = GetDetailRecord(detailGuid, billNo, addRowList).ToString();
 
                         // 检查单据头数据合法性
                         if (string.IsNullOrEmpty(masterSql)) return false;