SVN r816

SVN-Revision: r816

插件库/Lskj.PubBillSpecial/BillModule.cs

@@ -3798,6 +3798,23 @@ namespace Lskj.PubBillSpecial
         private bool BillSave(int comfirm = 0, bool canTipMsg = true)
         {
             bool saveResult = false;
+
+            if (this.gridEx != null) 
+            {
+                DataRow[] modifiedRows = (this.gridEx.GridControlObj.GridControl.DataSource as DataTable)
+                                           .Rows
+                                           .Cast<DataRow>()
+                                           .Where(x => x.RowState == DataRowState.Modified || x.RowState == DataRowState.Added)
+                                           .ToArray();
+                if (modifiedRows != null && modifiedRows.Length >0)
+                {
+                    this.gridEx.isSuccessfullySaved = false;
+                    this.gridEx.BtnSave.PerformClick();
+                    if (!this.gridEx.isSuccessfullySaved) return  false;
+                }
+
+            }
+
             if (this.ControlObj.VerifyNull())
             {
                 //保存前执行某个右键
@@ -6618,6 +6635,11 @@ namespace Lskj.PubBillSpecial
                                     }
                                 }
                             }
+                            else
+                            {
+                                MessageUtil.Show("扫码配置错误");
+                                return;
+                            }
                             break;
 
                     }

插件库/Lskj.PubBillSpecial/FrmScanCodeAssociation.cs

@@ -1,6 +1,7 @@
 using Lskj.Business.Impl;
 using Lskj.Control;
 using Lskj.Control.Model;
+using Lskj.Core;
 using Lskj.Model;
 using Lskj.Util;
 using System;
@@ -47,4 +48,4 @@ namespace Lskj.PubBillSpecial
             //根据传入的模块号获取模块信息
             this.SysModel = new ModuleModel(modelRow);
             DataTable mainGridColumns = BaseModuleImpl.GetBaseGridColumns(this.SysModel.ModeCode);
-            this.gcMain.SetReadOnlyColumns(mainGridColumns, GridCustomColumnStruct.BaseMainGridView + this.SysMode
+            this.gcMain.SetReadOnlyColumns(mainGridColumns, GridCustomColumnStruct.BaseMainGridView + this.SysModel.FormK

插件库/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>
         ///