SVN r433

SVN-Revision: r433

插件库/Lskj.PubAccraditation/FrmAccraditation.cs

@@ -522,6 +522,15 @@ namespace Lskj.PubAccraditation
             {
                 if (menuCondRow["DllFileName"].Equals("Lskj.PubAccraditationBrp.dll")) this.isBrpAccrad = true;// 是否是Brp模式加载
             }
+
+            if (this.BillModelObj.AutoMultiHeader == 1)
+            {
+                this.pl_detail.Controls.Clear();
+                this.gridBillInfo = new BandedGridControlEx();
+                this.gridBillInfo.Model = this.SysModel;
+                this.gridBillInfo.Dock = DockStyle.Fill;
+                this.pl_detail.Controls.Add(this.gridBillInfo);
+            }
             //树表格
             if (this.BillModelObj.DetailTreeTable)
             {
@@ -961,7 +970,16 @@ namespace Lskj.PubAccraditation
             }
             else
             {
-                this.gridBillInfo.SetGridRightMenus(dtGridRightMenu, this.SysModel, OnGridViewRightCallBack);
+                if (this.gridBillInfo is BandedGridControlEx)// 判断是不是多表头表格
+                {
+                    //设置表格右键菜单
+                    (this.gridBillInfo as BandedGridControlEx).SetGridRightMenus(dtGridRightMenu, this.SysModel, OnGridViewRightCallBack);
+                }
+                else
+                {
+                    this.gridBillInfo.SetGridRightMenus(dtGridRightMenu, this.SysModel, OnGridViewRightCallBack);
+                }
+
             }
             if (!dataCaches.GetValue(gridBillInfo, "BaseGridRowColors", out DataTable dtBaseGridRowColors))
             {
@@ -2273,7 +2291,7 @@ namespace Lskj.PubAccraditation
             {
                 defaultValue = BaseImpl.GetDefaultValue(defaultValue);
             }
-            string billNo = this.BillModelObj.NewVer == 1 ? BillImpl.GetBillNo(this.BillModelObj.BillSeq) : defaultValue;
+            string billNo = this.BillModelObj.NewVer == 1|| SystemInfo.Instance.SplitOrderNewVer ? BillImpl.GetBillNo(this.BillModelObj.BillSeq) : defaultValue;
             //构造表头
             string masterSql = this.GetBillHearder(billNo);
             //构造明细"@billdocument_id@"

插件库/Lskj.PubAccraditation/FrmSpare.cs

@@ -94,6 +94,7 @@ namespace Lskj.PubAccraditation
                 this.gridNew.gridControl.DoubleClick += new EventHandler(gridNewView_DoubleClick);
                 //历史数据
                 this.gridHistory.SetReadOnlyColumns(dtColumns);
+                BillAuditImpl.CreateSourceBillId(this.BillModel.MasterTable);
                 this.gridHistory.SetGridViewDataSource(BillAuditImpl.GetSpareBillHistory(this.BillModel.PrimaryKey, this.BillModel.MasterTable, this.SysModel.BillDocumentId));
             }
             catch (Exception ex)
@@ -216,34 +217,4 @@ namespace Lskj.PubAccraditation
         {
             try
             {
-                this.DialogResult = MessageUtil.Show(ResourceKeys.ConfirmSpliterBill, MessageBoxButtons.YesNo) == DialogResult.Yes ? DialogResult.OK : DialogResult.No;
-                this.Close();
-            }
-            catch (Exception ex)
-            {
-                //MessageUtil.Show(ex);
-                string Message = ErrorMessage.PromptErrorMessage(ex);
-                MessageUtil.Show(Message,ex.Message);
-            }
-        }
-        #endregion
-
-        #region 关闭
-        /// <summary>
-        /// <para>说明：关闭事件</para>
-        /// <para>创建人：龚宇超</para>
-        /// <para>创建日期：2017-01-30</para>
-        /// <para>修改人：</para>
-        /// <para>修改日期：</para>
-        /// <para>修改备注：</para>
-        /// <para>版本：1.0</para>
-        /// </summary>
-        /// <param name="sender">The source of the event.</param>
-        /// <param name="e">The <see cref="EventArgs"/> instance containing the event data.</param>
-        private void btnClose_Click(object sender, EventArgs e)
-        {
-            this.Close();
-        }
-        #endregion
-    }
-}
+                this.DialogResult = MessageUtil.Show(ResourceKeys.ConfirmSpliterBill, MessageBoxButtons.YesNo) == DialogResult.Yes ? DialogResult.OK