需求单No.139429 订单调整第二个页面：增加字段“辅数量”“辅单位”“单价”“备注”；减少字段：“金额”；订货时间和发货时间位置互换

B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateEdit.cs

@@ -261,7 +261,7 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools {
       _goodsGrid.Columns.Add(new DFEditGridColumn<DFValueLabel>("Goods_Name"));
 
       _goodsGrid.Columns.Add(new DFEditGridColumn<DFValueLabel>("Goods_Spec"));
-
+      
       var col = new DFEditGridColumn<DFTextBox>("UnitNum");
       col.InitEditControl += (sender, e) => {
         e.Control.Attributes["onchange"] = @"SetSumInfo();this.dfContainer.setValue('ChangeFlag','true');  ";
@@ -270,11 +270,14 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools {
       _goodsGrid.Columns.EAdd(col).SumMode = SumMode.Sum;
 
       _goodsGrid.Columns.Add(new DFEditGridColumn<DFValueLabel>("Unit"));
+      _goodsGrid.Columns.EAdd(new DFEditGridColumn<DFValueLabel>("SecondNumber")).SumMode = SumMode.Sum;
+      _goodsGrid.Columns.Add(new DFEditGridColumn<DFValueLabel>("Goods_SecondUnit"));
+      _goodsGrid.Columns.Add(new DFEditGridColumn<DFValueLabel>("Price"));
 
-      _goodsGrid.Columns.EAdd(new DFEditGridColumn<DFValueLabel>("Money")).SumMode = SumMode.Sum;
-      _goodsGrid.Columns.Add(new DFEditGridColumn<DFValueLabel>("OrderDate"));
       _goodsGrid.Columns.Add(new DFEditGridColumn<DFValueLabel>("LoadTime"));
-      _goodsGrid.Columns.Add(new DFEditGridColumn<DFTextBox>("ChangeFlag"));
+      _goodsGrid.Columns.Add(new DFEditGridColumn<DFValueLabel>("OrderDate"));
+      //_goodsGrid.Columns.Add(new DFEditGridColumn<DFTextBox>("ChangeFlag"));
+      _goodsGrid.Columns.Add(new DFEditGridColumn<DFValueLabel>("Remark"));
 
       _goodsGrid.ValueColumns.Add("SaleGoods_ID");
       _goodsGrid.ValueColumns.Add("Goods_UnitConvertDirection");
@@ -481,6 +484,8 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools {
       dom.Columns.Add(DQSelectColumn.Field("GoodsBatch_Name", detailAlias));
       dom.Columns.Add(DQSelectColumn.Field("LoadTime", order));
       dom.Columns.Add(DQSelectColumn.Field("OrderDate", order));
+      dom.Columns.Add(DQSelectColumn.Field("Goods_SecondUnit", detailAlias));
+      dom.Columns.Add(DQSelectColumn.Field("Remark", detailAlias));
       //dom.Columns.Add(DQSelectColumn.Create(DQExpression.Field(storeDetail, "Number").EAdd(DQExpression.Field(output, "Number")), "Number1"));
       var condition = (IList<IDQExpression>)ViewStateUtil.Current.LoadFromPersistenceMedium(uint.Parse(Request.QueryString["cacheid"]), true);
       foreach (var expression in condition) {
@@ -509,7 +514,9 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools {
               GoodsBatch_ID = (long?)reader[11],
               GoodsBatch_Name = (string)reader[12],
               LoadTime = (DateTime?)reader[13],
-              OrderDate = (DateTime?)reader[14]
+              OrderDate = (DateTime?)reader[14],
+              Goods_SecondUnit = (string)reader[15],
+              Remark = (string)reader[16]
             };
             Details.Add(detail);
           }