From 7f97293e110092ecab2a9728a462fdaeee1d55d7 Mon Sep 17 00:00:00 2001
From: wugang <425674808@qq.com>
Date: Fri, 1 Jun 2018 11:37:17 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=8F=90=E4=BA=A4=E5=8D=95No?=
=?UTF-8?q?.45984?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj | 16 ++++++++++++----
.../Pages/B3YunKen/Bill/GoodsPackageSet.cs | 2 +-
.../B3YunKen/Reports/ToFreightNetPriceReport2.cs | 1 +
BWP.B3_YunKen/TypeIoc/CheckDealerInfoTypeIOC.cs | 2 +-
4 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj b/BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj
index 51791c5..2faed3e 100644
--- a/BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj
+++ b/BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj
@@ -122,9 +122,15 @@
ASPXCodeBehind
-
-
-
+
+ ASPXCodeBehind
+
+
+ ASPXCodeBehind
+
+
+ ASPXCodeBehind
+
ASPXCodeBehind
@@ -137,7 +143,9 @@
ASPXCodeBehind
-
+
+ ASPXCodeBehind
+
ASPXCodeBehind
diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/Bill/GoodsPackageSet.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/Bill/GoodsPackageSet.cs
index 27bdf30..472800f 100644
--- a/BWP.B3_YunKen.Web/Pages/B3YunKen/Bill/GoodsPackageSet.cs
+++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/Bill/GoodsPackageSet.cs
@@ -448,7 +448,7 @@ namespace BWP.Web.Pages.B3YunKen.Bill
break;
dom.Columns.Add(
DQSelectColumn.Create(
- DQExpression.Sum(DQExpression.LogicCase(DQCondition.EQ(WrappageKind, "TreeDeep1ID", tuple.Item1), DQExpression.Field(package, "ID"))), tuple.Item2));
+ DQExpression.Max(DQExpression.LogicCase(DQCondition.EQ(WrappageKind, "TreeDeep1ID", tuple.Item1), DQExpression.Field(package, "ID"))), tuple.Item2));
i++;
}
dom.Columns.Add(DQSelectColumn.Create(DQExpression.Sum(DQExpression.LogicCase(DQCondition.InEQ(WrappageKind, "TreeDeep1ID", 5), DQExpression.Value(0), DQExpression.Field(gpackage, "SmallPackNum"))), "SmallPackNum"));
diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport2.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport2.cs
index e9e9173..a5c9966 100644
--- a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport2.cs
+++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport2.cs
@@ -385,6 +385,7 @@ 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/TypeIoc/CheckDealerInfoTypeIOC.cs b/BWP.B3_YunKen/TypeIoc/CheckDealerInfoTypeIOC.cs
index e306b43..48b6638 100644
--- a/BWP.B3_YunKen/TypeIoc/CheckDealerInfoTypeIOC.cs
+++ b/BWP.B3_YunKen/TypeIoc/CheckDealerInfoTypeIOC.cs
@@ -19,7 +19,7 @@ namespace BWP.B3_YunKen.TypeIocs
if (id != null && !customer.IsDealers)
throw new ApplicationException("该客户是经销商客户是否经销商不能选择为否（客户名称查询【经销商】档案基本属性的‘经销商’）");
var dealerID = InnerBLUtil.GetDmoProperty(session, "Dealer_ID", new Tuple("Customer_ID", customer.ID));
- if (dealerID != null && customer.IsDealers)
+ if (id == null && dealerID != null && customer.IsDealers)
throw new ApplicationException("该客户属于【经销商】档案No." + dealerID + "，请先维护经销商档案");
}
}