错误提交单No.45984

BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj

@@ -122,9 +122,15 @@
     <Compile Include="Pages\B3YunKen\Overlays\ProduceFinishBtnExt.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
-    <Compile Include="Pages\B3YunKen\Overlays\ProduceFinishEdit_Ext.cs" />
-    <Compile Include="Pages\B3YunKen\Overlays\ProductNoticeEdit_Ext.cs" />
-    <Compile Include="Pages\B3YunKen\Overlays\ProductNoticeReport_Ext.cs" />
+    <Compile Include="Pages\B3YunKen\Overlays\ProduceFinishEdit_Ext.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Pages\B3YunKen\Overlays\ProductNoticeEdit_Ext.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Pages\B3YunKen\Overlays\ProductNoticeReport_Ext.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
     <Compile Include="Pages\B3YunKen\Overlays\ReturnApplicationEdit_Ext.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
@@ -137,7 +143,9 @@
     <Compile Include="Pages\B3YunKen\Overlays\SaleOutStoreEdit_Ext.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
-    <Compile Include="Pages\B3YunKen\Overlays\SelectProductNoticeDialog_Ext.cs" />
+    <Compile Include="Pages\B3YunKen\Overlays\SelectProductNoticeDialog_Ext.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
     <Compile Include="Pages\B3YunKen\Overlays\VerificationPage_Ext.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>

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"));

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;

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<Dealer_Detail, long?>(session, "Dealer_ID", new Tuple<string, object>("Customer_ID", customer.ID));
-        if (dealerID != null && customer.IsDealers)
+        if (id == null && dealerID != null && customer.IsDealers)
           throw new ApplicationException("该客户属于【经销商】档案No." + dealerID + "，请先维护经销商档案");
       }
     }