SVN r816

SVN-Revision: r816

插件库/Lskj.PubBillSpecial/FrmSource.cs

@@ -196,7 +196,7 @@ namespace Lskj.PubBillSpecial
         private void OnMenuApplyBefore(ApplyArgs e)
         {
             string[] paramList = new string[e.MemuModel.ParamList.Count];
-
+            DataRow rowItem = this.gcMain.GetViewFocusedDataRow();
             for (int i = 0; i < e.MemuModel.ParamList.Count; i++)
             {
                 string item = e.MemuModel.ParamList[i];
@@ -209,7 +209,10 @@ namespace Lskj.PubBillSpecial
                     }
                     if (cond.Equals("{" + this.PrimaryKey + "}", StringComparison.OrdinalIgnoreCase))
                     {
-                        item = ReplaceHelper.ReplaceParamToValue(item, cond, this.PrimaryValue);
+                        if (!rowItem.Table.Columns.Contains(this.PrimaryKey)) 
+                        {
+                            item = ReplaceHelper.ReplaceParamToValue(item, cond, this.PrimaryValue);
+                        }   
                     }
                 }
                 paramList[i] = item;
@@ -766,4 +769,7 @@ namespace Lskj.PubBillSpecial
             return result;
         }
 
+        /// <summary>
+        /// 继续制单按钮点击
+        /// </summary>
         ///