需求单No.138363

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

@@ -309,6 +309,7 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools {
             detail.Price = cDetail.Price;
             changed = true;
           }
+          detail.AdjustNum += 1;
         }
 
         if (changed) {
@@ -465,7 +466,7 @@ 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]
             };
             Details.Add(detail);
           }

B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateList.cs

@@ -164,6 +164,7 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools {
       _grid.Columns.Add(new DFBrowseGridColumn("可用库存"));
       _grid.Columns.Add(new DFBrowseGridColumn("测算数量"));
       _grid.Columns.Add(new DFBrowseGridColumn("可用与预算合计"));
+      _grid.Columns.Add(new DFBrowseGridColumn("AdjustNum"));
       _grid.Columns.Add(new DFBrowseGridColumn("预计剩余数量"));
       _grid.Columns.Add(new DFBrowseGridColumn("预计剩余头数"));
       _grid.OnDetailDataBound += (htmlRow, dataRow, o) => {
@@ -172,8 +173,8 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools {
           return;
         var diff = (decimal?)row["预计剩余数量"];
 
-        AddLinkBt(o, row, 5, diff, htmlRow);
         AddLinkBt(o, row, 6, diff, htmlRow);
+        AddLinkBt(o, row, 7, diff, htmlRow);
       };
 
       tPanel.Controls.Add(_grid);
@@ -240,7 +241,7 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools {
       AvailableStorageUtil.RegisgterAvaliableStorageUnionTable(dom, context);
       //汇总可用库存
       RegisgterAvaliableStorageSumTable(dom);
-      dom.RegisterQueryTable(typeof(OrderTmp), new[] { "GoodsProperty_ID", "Number", "SecondNumber", "UnitNum" }, GetOrderDQueryDom());
+      dom.RegisterQueryTable(typeof(OrderTmp), new[] { "GoodsProperty_ID", "Number", "SecondNumber", "UnitNum", "AdjustNum" }, GetOrderDQueryDom());
       dom.RegisterQueryTable(typeof(OutputTmp), new[] { "GoodsProperty_ID", "Number", "MainNumber","Date" }, GetOutputDQueryDom());
       dom.RegisterQueryTable(typeof(OutputConfigTmp), new[] { "GoodsProperty_ID", "Number" }, GetOutputConfigureDom());
       dom.From.AddJoin(JoinType.Left, new DQDmoSource(goodsProperty), DQCondition.EQ(bill, "GoodsProperty_ID", goodsProperty, "ID"));
@@ -250,6 +251,7 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools {
       dom.Columns.Add(DQSelectColumn.Field("GoodsProperty_ID", bill));
       dom.Columns.Add(DQSelectColumn.Field("GoodsProperty_Name", bill));
       dom.Columns.Add(DQSelectColumn.Field("UnitNum", bill));
+      dom.Columns.Add(DQSelectColumn.Field("AdjustNum", bill));
 
       dom.Columns.Add(DQSelectColumn.Create(DQExpression.Field(storeDetail, "Number"), "可用库存"));
       dom.Columns.Add(DQSelectColumn.Create(DQExpression.Field(output, "Number"), "测算数量"));
@@ -329,6 +331,9 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools {
       [Join("GoodsProperty_ID", "ID")]
       public string GoodsProperty_Name { get; set; }
 
+      [LogicName("调整次数")]
+      public int AdjustNum { get; set; }
+
     }
 
     class StoreDetailTmp {
@@ -383,8 +388,10 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools {
       dom.Columns.Add(DQSelectColumn.Create(DQExpression.Sum(DQExpression.Field(detail, "Number")), "主数量"));
       dom.Columns.Add(DQSelectColumn.Create(DQExpression.Sum(DQExpression.Field(detail, "SecondNumber")), "主数量"));
       dom.Columns.Add(DQSelectColumn.Create(DQExpression.Sum(DQExpression.Field(detail, "UnitNum")), "主数量"));
+      dom.Columns.Add(DQSelectColumn.Field("AdjustNum", detail));
 
       dom.GroupBy.Expressions.Add(DQExpression.Field(goodsProperty, "ID"));
+      dom.GroupBy.Expressions.Add(DQExpression.Field(detail, "AdjustNum"));
       dom.Where.Conditions.Add(DQCondition.EQ("BillState", 单据状态.未审核));
 
       dom.Where.Conditions.Add(DQCondition.EQ(bill, "Domain_ID", DomainContext.Current.ID));