需求单No.136598

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

@@ -234,11 +234,12 @@ namespace BWP.Web.Pages.B3YunKen.SaleForecastUpdateList_ {
       _goodsGrid.Columns.Add(new DFEditGridColumn<DFValueLabel>("Unit"));
       _goodsGrid.Columns.EAdd(new DFEditGridColumn<DFTextBox>("SecondNumber")).SumMode = SumMode.Sum;
       _goodsGrid.Columns.EAdd(new DFEditGridColumn<DFValueLabel>("Goods_SecondUnit"));
-
+      _goodsGrid.Columns.EAdd(new DFEditGridColumn<DFTextBox>("Price")) ;
       _goodsGrid.Columns.EAdd(new DFEditGridColumn<DFValueLabel>("Money")).SumMode = SumMode.Sum;
 
       _goodsGrid.Columns.EAdd(new DFEditGridColumn<DFValueLabel>("PolicyPrice"));
-
+      _goodsGrid.Columns.Add(new DFEditGridColumn<DFValueLabel>("GoodsBatch_Name"));
+ 
       _goodsGrid.ValueColumns.Add("SaleGoods_ID");
       _goodsGrid.ValueColumns.Add("Goods_UnitConvertDirection");
       _goodsGrid.ValueColumns.Add("Goods_MainUnitRatio");
@@ -341,6 +342,9 @@ namespace BWP.Web.Pages.B3YunKen.SaleForecastUpdateList_ {
       dom.Columns.Add(DQSelectColumn.Field("Money", detailAlias));
       dom.Columns.Add(DQSelectColumn.Field("Customer_Name", order));
       dom.Columns.Add(DQSelectColumn.Field("SaleForecast_ID", detailAlias));
+      dom.Columns.Add(DQSelectColumn.Field("GoodsBatch_ID", detailAlias));
+      dom.Columns.Add(DQSelectColumn.Field("GoodsBatch_Name", detailAlias));
+
       if (SaleGoods_ID != null) {
         dom.Where.Conditions.Add(DQCondition.EQ(detailAlias, "SaleGoods_ID", SaleGoods_ID));
       }
@@ -392,6 +396,8 @@ namespace BWP.Web.Pages.B3YunKen.SaleForecastUpdateList_ {
               Money = (Money<金额>?)reader[8],
               Customer_Name = (string)reader[9],
               SaleForecast_ID = (long)reader[10],
+              GoodsBatch_ID = (long?)reader[11],
+              GoodsBatch_Name = (string)reader[12]
             };
             Details.Add(detail);
           }