From 3f0f382d21b9072dbac2b68ec51d391814277a4a Mon Sep 17 00:00:00 2001 From: wugang <425674808@qq.com> Date: Sat, 2 Jun 2018 09:08:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=8C=89=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=9D=E5=AD=98=E4=BB=B7=E6=A0=BC=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BWP.B3_YunKen.Web/Pages/B3YunKen/Bill/GoodsPackageSet.cs | 4 ++-- .../Pages/B3YunKen/Reports/ToFreightNetPriceReport2.cs | 1 - BWP.B3_YunKen/BO/Bill/Goods_PackagePrice.cs | 5 ----- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/Bill/GoodsPackageSet.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/Bill/GoodsPackageSet.cs index 472800f..f60e6e7 100644 --- a/BWP.B3_YunKen.Web/Pages/B3YunKen/Bill/GoodsPackageSet.cs +++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/Bill/GoodsPackageSet.cs @@ -269,7 +269,7 @@ namespace BWP.Web.Pages.B3YunKen.Bill priceSum = price1 + price2 + price3 +price4; - Goods_PackagePrice gp = new Goods_PackagePrice { Goods_ID = savePrice.Goods_ID, Price = priceSum, AccountingUnit_ID = savePrice.AccountingUnit_ID, User_ID = DomainContext.Current.DomainUser.User_ID }; + Goods_PackagePrice gp = new Goods_PackagePrice { Goods_ID = savePrice.Goods_ID, Price = priceSum, AccountingUnit_ID = savePrice.AccountingUnit_ID }; Goods_PackagePriceList.Add(gp); @@ -280,7 +280,7 @@ namespace BWP.Web.Pages.B3YunKen.Bill using (var context = new TransactionContext()) { - string sql = "delete from B3_YunKen_Goods_PackagePrice where User_ID=" + DomainContext.Current.DomainUser.User_ID; + string sql = "delete from B3_YunKen_Goods_PackagePrice"; context.Session.ExecuteSqlNonQuery(sql); context.Session.Commit(); } diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport2.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport2.cs index aadbf91..e341315 100644 --- a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport2.cs +++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport2.cs @@ -387,7 +387,6 @@ B3SaleDataSources.经销商), s => long.Parse(s)), "CustomerDealer_ID")); query.Columns.Add(DQSelectColumn.Field("Goods_ID")); query.Columns.Add(DQSelectColumn.Create(DQExpression.Max(DQExpression.Field("Price")),"packagePrice")); query.Columns.Add(DQSelectColumn.Field("AccountingUnit_ID")); - query.Where.Conditions.Add(DQCondition.EQ("User_ID",DomainContext.Current.DomainUser.User_ID)); query.GroupBy.Expressions.Add(DQExpression.Field("Goods_ID")); query.GroupBy.Expressions.Add(DQExpression.Field("AccountingUnit_ID")); return query; diff --git a/BWP.B3_YunKen/BO/Bill/Goods_PackagePrice.cs b/BWP.B3_YunKen/BO/Bill/Goods_PackagePrice.cs index cc60818..9c27d45 100644 --- a/BWP.B3_YunKen/BO/Bill/Goods_PackagePrice.cs +++ b/BWP.B3_YunKen/BO/Bill/Goods_PackagePrice.cs @@ -26,10 +26,5 @@ namespace BWP.B3_YunKen.BO [LogicName("会计单位")] public long? AccountingUnit_ID { get; set; } - - [LogicName("用户ID")] - public long? User_ID { get; set; } - - } }