From 92c8beca515e9e5a67a74fd2d271106e0ffe73f0 Mon Sep 17 00:00:00 2001
From: duanluohua <duanluohua@bwp.com>
Date: Fri, 30 Mar 2018 09:04:22 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8D=95No.139253=20?=
 =?UTF-8?q?=E5=8F=96=E5=80=BC=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateEdit.cs  | 2 +-
 .../Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateList.cs  | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateEdit.cs b/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateEdit.cs
index 7680c0c..5a78304 100644
--- a/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateEdit.cs
+++ b/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateEdit.cs
@@ -193,7 +193,7 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools {
       label2.Font.Size = 14;
       label2.Width = 120;
       label2.Font.Bold = true;
-      label2.Text = Request.QueryString["mainNumber"].ToString();
+      label2.Text = Request.QueryString["currentNumber"].ToString();
       panel.Add(label2);
 
       panel.Add(new SimpleLabel("合计订货数量"));
diff --git a/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateList.cs b/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateList.cs
index da38d2e..5dd4229 100644
--- a/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateList.cs
+++ b/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateList.cs
@@ -216,10 +216,12 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools
       var idField = (long?)row["GoodsProperty_ID"];
       var number = ((decimal?)row["可用与预算合计"]) ?? 0;
       var mainNumber = ((decimal?)row["牛头数"]) ?? 0;
+      var currentNumber =Math.Round(Convert.ToDecimal(row["分完数量"]),2);
       var date = (DateTime?)row["测算日期"];
       var url = AspUtil.UpdateUrlParam("SaleOrderUpdateEdit.aspx", "GoodsProperty_ID", (idField ?? 0).ToString());
       url = AspUtil.UpdateUrlParam(url, "number", number.ToString());
       url = AspUtil.UpdateUrlParam(url, "mainNumber", mainNumber.ToString("#"));
+      url = AspUtil.UpdateUrlParam(url, "currentNumber", currentNumber.ToString());
       if (date.HasValue)
       {
         url = AspUtil.UpdateUrlParam(url, "date", date.Value.ToString("yyyy-MM-dd"));
@@ -249,7 +251,7 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools
       var storeDetail = new JoinAlias(typeof(StoreDetailTmp));
       var output = new JoinAlias(typeof(OutputTmp));
       var outputConfig = new JoinAlias(typeof(OutputConfigTmp));
-      var dom = new DQueryDom(output);
+      var dom = new DQueryDom(outputConfig);
       OrganizationUtil.RegisterOrganizationQueryTable(dom);
       var context = new AvailableStorageContext { Usage = StorageUsage.Sale };
 
@@ -260,10 +262,10 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools
       dom.RegisterQueryTable(typeof(OrderTmp), new[] { "GoodsProperty_ID", "Number", "SecondNumber", "UnitNum", "AdjustNumber" }, 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(output), DQCondition.EQ(output, "GoodsProperty_ID", outputConfig, "GoodsProperty_ID"));
       dom.From.AddJoin(JoinType.Left, new DQDmoSource(bill), DQCondition.EQ(bill, "GoodsProperty_ID", output, "GoodsProperty_ID"));
       dom.From.AddJoin(JoinType.Left, new DQDmoSource(goodsProperty), DQCondition.EQ(output, "GoodsProperty_ID", goodsProperty, "ID"));
       dom.From.AddJoin(JoinType.Left, new DQDmoSource(storeDetail), DQCondition.EQ(output, "GoodsProperty_ID", storeDetail, "GoodsProperty_ID"));
-      dom.From.AddJoin(JoinType.Left, new DQDmoSource(outputConfig), DQCondition.EQ(output, "GoodsProperty_ID", outputConfig, "GoodsProperty_ID"));
       dom.Columns.Add(DQSelectColumn.Field("GoodsProperty_ID", output));
       dom.Columns.Add(DQSelectColumn.Create(DQExpression.Field(output, "GoodsProperty_Name"), "存货属性名称"));
       dom.Columns.Add(DQSelectColumn.Create(DQExpression.Field(outputConfig, "Number"), "单品测算数量"));
@@ -317,10 +319,11 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools
       query.From.AddJoin(JoinType.Left, new DQDmoSource(goodsPropertyCatalog), DQCondition.EQ(goodsProperty, "GoodsPropertyCatalog_ID", goodsPropertyCatalog, "ID"));
 
       AddGoodsCondition(goodsPropertyCatalog, goodsProperty, query);
-
+      
       query.Columns.Add(DQSelectColumn.Field("GoodsProperty_ID"));
       query.Columns.Add(DQSelectColumn.Create(DQExpression.Sum(DQExpression.Field("Number")), "主数量"));
 
+      query.GroupBy.Expressions.Add(DQExpression.Field("ID"));
       query.GroupBy.Expressions.Add(DQExpression.Field("GoodsProperty_ID"));
       query.Where.Conditions.Add(DQCondition.EQ(bill, "ID", id));
       query.Where.Conditions.Add(DQCondition.GreaterThan(detail, "GoodsProperty_ID", 0));