需求单No.138470

BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/SaleForecastEdit_Ext.cs

@@ -13,6 +13,8 @@ using Forks.EnterpriseServices.SqlDoms;
 using Forks.Utils;
 using TSingSoft.WebControls2;
 using TSingSoft.WebPluginFramework;
+using BWP.B3Sale.BL;
+using Forks.EnterpriseServices.BusinessInterfaces;
 
 namespace BWP.Web.Pages.B3YunKen.Overlays
 {
@@ -43,6 +45,11 @@ namespace BWP.Web.Pages.B3YunKen.Overlays
     List<SaleForecast_Detail> LoadList()
     {
       var list=new List<SaleForecast_Detail>();
+      var factor = new PriceFactor {
+        Customer_ID = Dmo.Customer_ID,
+        Time = Dmo.Date,
+        AccountingUnit_ID = Dmo.AccountingUnit_ID
+      };
       using (var session=Forks.EnterpriseServices.DomainObjects2.Dmo.NewSession())
       {
         var maxid = GetMaxId(session);
@@ -72,16 +79,20 @@ namespace BWP.Web.Pages.B3YunKen.Overlays
                 UnitNum = (Money<decimal>?)reader[4],
                 SecondNumber = (Money<decimal>?)reader[5],
               };
+              
               list.Add(dmodetail);
             }
           }
         }
 
-      foreach (SaleForecast_Detail forecastDetail in list)
+      IRebateBL bl = BIFactory.Create<IRebateBL>();
+      foreach (SaleForecast_Detail detail in list)
       {
-        DmoUtil.RefreshDependency(forecastDetail, "SaleGoods_ID");
+        DmoUtil.RefreshDependency(detail, "SaleGoods_ID");
+        detail.Rebate = bl.GetRebate(factor.Customer_ID, factor.Time, detail.SaleGoods_ID);
+        detail.SetPrice(factor);
+        detail.NetPrice = detail.Price;
       }
-
       return list;
     }
 

BWP.B3_YunKen.Web/PluginClass.cs

@@ -35,6 +35,7 @@ namespace BWP.B3_YunKen.Web
       GlobalFlags.On(B3SaleConsts.Flags.IsYunKen);
       GlobalFlags.On(B3SaleConsts.Flags.SaleForecastEmployeeAndDeptIsReadOnly);
       GlobalFlags.On(B3SaleConsts.Flags.PriceBillNotUpdateFromLastBill);
+      GlobalFlags.On(B3SaleConsts.Flags.OpenReturnInStoreSelectOutStore);
       WpfPageFactory.RegisterPageOverlay(typeof(OrderEdit).FullName, typeof(OrderEdit_Ext).FullName);
       WpfPageFactory.RegisterPageOverlay(typeof(SaleOutStoreEdit).FullName, typeof(SaleOutStoreEdit_Ext).FullName);
       WpfPageFactory.RegisterPageOverlay(typeof(SaleForecastEdit).FullName, typeof(SaleForecastEdit_Ext).FullName);