From 564ab73eac1d90c83661d72d9b0b20dca7b7f50e Mon Sep 17 00:00:00 2001 From: duanluohua Date: Thu, 30 Nov 2017 19:04:03 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=E9=9C=80=E6=B1=82=E5=8D=95No.137533?= =?UTF-8?q?=EF=BC=8C=E3=80=90=E5=8F=B8=E6=9C=BA=E6=A1=A3=E6=A1=88=E3=80=91?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=90=8D=E7=A7=B0=E4=B8=8D=E8=83=BD=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E9=80=BB=E8=BE=91=EF=BC=8C=E6=94=B9=E4=B8=BA=E8=BA=AB?= =?UTF-8?q?=E4=BB=BD=E8=AF=81=E5=8F=B7=E4=B8=8D=E8=83=BD=E9=87=8D=E5=A4=8D?= =?UTF-8?q?"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 12ba9695e21311c296f077d6206fbf6f0ecac859. --- BWP.B3_YunKen.Web/PluginClass.cs | 5 --- BWP.B3_YunKen/BWP.B3_YunKen.csproj | 1 - .../TypeIocs/DriverBeforeSaveTypeIoc.cs | 37 ------------------- 3 files changed, 43 deletions(-) delete mode 100644 BWP.B3_YunKen/TypeIocs/DriverBeforeSaveTypeIoc.cs diff --git a/BWP.B3_YunKen.Web/PluginClass.cs b/BWP.B3_YunKen.Web/PluginClass.cs index e52f01c..045615e 100644 --- a/BWP.B3_YunKen.Web/PluginClass.cs +++ b/BWP.B3_YunKen.Web/PluginClass.cs @@ -1,9 +1,6 @@ using BWP.B3Sale; using TSingSoft.WebPluginFramework; using BWP.B3UnitedInfos; -using TSingSoft.WebPluginFramework.Pages; -using BWP.Web.Pages.B3Sale.Bills.Order_; -using BWP.Web.Pages.B3YunKen.Overlays; namespace BWP.B3_YunKen.Web { @@ -11,14 +8,12 @@ namespace BWP.B3_YunKen.Web { public void OnInit() { - WpfPageFactory.RegisterPageOverlay(typeof(OrderEdit).FullName, typeof(OrderEdit_Ext).FullName); GlobalFlags.On(B3SaleConsts.Flags.EnableStandardGoods); GlobalFlags.On(B3SaleConsts.Flags.RecordLastSaleOutStoreDate); GlobalFlags.On(B3SaleConsts.Flags.IsYunKen); GlobalFlags.On(B3UnitedInfosConsts.GlobalFlags.库存支持品牌项); - GlobalFlags.On(B3SaleConsts.Flags.DriverNameAllowSame); } public void OnUnitInit() diff --git a/BWP.B3_YunKen/BWP.B3_YunKen.csproj b/BWP.B3_YunKen/BWP.B3_YunKen.csproj index 8bb0447..fa78861 100644 --- a/BWP.B3_YunKen/BWP.B3_YunKen.csproj +++ b/BWP.B3_YunKen/BWP.B3_YunKen.csproj @@ -55,7 +55,6 @@ - diff --git a/BWP.B3_YunKen/TypeIocs/DriverBeforeSaveTypeIoc.cs b/BWP.B3_YunKen/TypeIocs/DriverBeforeSaveTypeIoc.cs deleted file mode 100644 index fa35b5e..0000000 --- a/BWP.B3_YunKen/TypeIocs/DriverBeforeSaveTypeIoc.cs +++ /dev/null @@ -1,37 +0,0 @@ -using BWP.B3Sale.BL; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using BWP.B3Sale.BO; -using Forks.EnterpriseServices.BusinessInterfaces; -using BWP.B3Frameworks; -using Forks.EnterpriseServices.DomainObjects2.DQuery; -using Forks.EnterpriseServices.DomainObjects2; - -namespace BWP.B3_YunKen.TypeIocs -{ - [TypeIOC(typeof(DriverBL), typeof(DriverBL.BaseBLIOCs.BeforeSave))] - public class DriverBeforeSaveTypeIoc : DriverBL.BaseBLIOCs.BeforeSave - { - public void Invoke(IDmoContext context, Driver dmo) - { - CheckNotAllowSameName(context, dmo); - } - - private void CheckNotAllowSameName(IDmoContext context, Driver dmo) - { - var query = new DQueryDom(new JoinAlias(typeof(Driver))); - query.Where.Conditions.Add(DQCondition.EQ("IDCard", dmo.IDCard)); - query.Where.Conditions.Add(DQCondition.InEQ("ID", dmo.ID)); - - query.Columns.Add(DQSelectColumn.Field("ID")); - - var id = context.Session.ExecuteScalar(query); - if (id != null) - { - throw new Exception("身份证号:"+dmo.IDCard+" 已经存在单号:"+id+" 上"); - } - } - } -}