需求单No.137519

.gitignore

@@ -2,3 +2,4 @@ bin
 obj
 .*
 /*.suo
+_ReSharper.B3_YunKen

BWP.B3_YunKen.Web/Pages/B3YunKen/B3YunKenSaleOutStoreToCustomerAccept.cs

@@ -152,7 +152,7 @@ namespace BWP.Web.Pages.B3YunKen {
       _detailGrid = vPanel.Add(new DFEditGrid(detailEditor) { Width = Unit.Percentage(100) });
       _detailGrid.ShowLineNo = true;
       _detailGrid.MultiSelectionEnabled = true;
-
+      _detailGrid.Columns.Add(new DFEditGridColumn<DFValueLabel>("BrandItem_Name"));
       _detailGrid.Columns.Add(new DFEditGridColumn<DFValueLabel>("Goods_Name"));
 
       _detailGrid.Columns.Add(new DFEditGridColumn<DFValueLabel>("Goods_Spec"));

BWP.B3_YunKen.Web/Pages/B3YunKen/SaleForecastUpdateList_/SaleForecastUpdateEdit.cs

@@ -225,6 +225,7 @@ namespace BWP.Web.Pages.B3YunKen.SaleForecastUpdateList_ {
         _goodsGrid.Columns.Add(new DFEditGridColumn<DFValueLabel>("Customer_Name"));
       }
       _goodsGrid.ShowLineNo = true;
+      _goodsGrid.Columns.Add(new DFEditGridColumn<DFValueLabel>("BrandItem_Name"));
       _goodsGrid.Columns.Add(new DFEditGridColumn<DFValueLabel>("Goods_Code"));
       _goodsGrid.Columns.Add(new DFEditGridColumn<DFValueLabel>("Goods_Name"));
 
@@ -344,7 +345,8 @@ namespace BWP.Web.Pages.B3YunKen.SaleForecastUpdateList_ {
       dom.Columns.Add(DQSelectColumn.Field("SaleForecast_ID", detailAlias));
       dom.Columns.Add(DQSelectColumn.Field("GoodsBatch_ID", detailAlias));
       dom.Columns.Add(DQSelectColumn.Field("GoodsBatch_Name", detailAlias));
-
+      dom.Columns.Add(DQSelectColumn.Field("BrandItem_ID", detailAlias));
+      dom.Columns.Add(DQSelectColumn.Field("BrandItem_Name", detailAlias));
       if (SaleGoods_ID != null) {
         dom.Where.Conditions.Add(DQCondition.EQ(detailAlias, "SaleGoods_ID", SaleGoods_ID));
       }
@@ -397,7 +399,9 @@ namespace BWP.Web.Pages.B3YunKen.SaleForecastUpdateList_ {
               Customer_Name = (string)reader[9],
               SaleForecast_ID = (long)reader[10],
               GoodsBatch_ID = (long?)reader[11],
-              GoodsBatch_Name = (string)reader[12]
+              GoodsBatch_Name = (string)reader[12],
+              BrandItem_ID = (long?)reader[11],
+              BrandItem_Name = (string)reader[12]
             };
             Details.Add(detail);
           }