From 7f7d2f653447e2669504e939bb0a0f8e325be19b Mon Sep 17 00:00:00 2001
From: luanhui <1029149336@qq.com>
Date: Mon, 11 Dec 2017 21:00:54 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8D=95No.137711?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Tools/SaleOrderUpdateList.cs               | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateList.cs b/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateList.cs
index 2f07326..59514ad 100644
--- a/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateList.cs
+++ b/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateList.cs
@@ -34,7 +34,7 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools {
   class SaleOrderUpdateList : AppBasePage {
     QueryContainer _queryContainer;
     readonly DFInfo _dFInfo = DFInfo.Get(typeof(Order));
-    private DFChoiceBox _goodsPropertyCatalog;
+    private DFChoiceBox _goodsPropertyCatalog,_liuchengfenlei;
     private ChoiceBox _goodsProperty;
     private HiddenField hidden;
     private DFChoiceBox _storeInput, _accInput, _customerCatalogt, _customerInput;
@@ -55,6 +55,13 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools {
       layoutManager.Add("GoodsPropertyCatalog_ID", new SimpleLabel("存货属性分类"), _goodsPropertyCatalog);
       layoutManager["GoodsPropertyCatalog_ID"].NotAutoAddToContainer = true;
 
+
+      _liuchengfenlei = QueryCreator.DFChoiceBox(_dFInfo.Fields["ID"], B3FrameworksConsts.DataSources.流程状态分类);
+      layoutManager.Add("DepartmentWorkFlowStateCategory_ID", new SimpleLabel("流程状态分类"), _liuchengfenlei);
+      layoutManager["DepartmentWorkFlowStateCategory_ID"].NotAutoAddToContainer = true;
+
+
+
       layoutManager.Add("AccountingUnit_ID", new SimpleLabel("会计单位"), _accInput = QueryCreator.DFChoiceBox(_dFInfo.Fields["AccountingUnit_ID"], B3FrameworksConsts.DataSources.授权会计单位全部), false);
       layoutManager.Add("Store_ID", new SimpleLabel("仓库"), _storeInput = QueryCreator.DFChoiceBox(_dFInfo.Fields["Store_ID"], B3FrameworksConsts.DataSources.授权仓库), false);
 
@@ -72,6 +79,7 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools {
       config.Add("GoodsProperty_ID");
       config.Add("GoodsPropertyCatalog_ID");
       config.Add("CustomerCatalog_ID");
+      config.Add("DepartmentWorkFlowStateCategory_ID");
       layoutManager.Config = config;
       var section = mPageLayoutManager.AddSection("BaseProperties", "查询条件");
       section.ApplyLayout(layoutManager, config, mPageLayoutManager, _dFInfo);
@@ -334,6 +342,7 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools {
     DQueryDom GetOrderDQueryDom() {
       var dom = _queryContainer.Build();
       var bill = dom.From.RootSource.Alias;
+      var flowdetail=new JoinAlias("flowdetail",typeof(DepartmentWorkFlow_Detail));
       var detail = new JoinAlias("detail", typeof(Order_Detail));
       var goodsPropertyCatalog = new JoinAlias("_gpc", typeof(GoodsPropertyCatalog));
       var goodsProperty = new JoinAlias("_gp", typeof(GoodsProperty));
@@ -345,7 +354,12 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools {
       dom.From.AddJoin(JoinType.Left, new DQDmoSource(goodsProperty), DQCondition.EQ(goodsProperty, "ID", goods, "GoodsProperty_ID"));
       dom.From.AddJoin(JoinType.Left, new DQDmoSource(goodsPropertyCatalog), DQCondition.EQ(goodsProperty, "GoodsPropertyCatalog_ID", goodsPropertyCatalog, "ID"));
       dom.From.AddJoin(JoinType.Left, new DQDmoSource(customer), DQCondition.EQ(bill, "Customer_ID", customer, "ID"));
-
+     
+      dom.From.AddJoin(JoinType.Left, new DQDmoSource(flowdetail), DQCondition.EQ(bill, "DepartmentWorkFlow_Detail_ID", flowdetail, "ID"));
+      if (!_liuchengfenlei.IsEmpty)
+      {
+        dom.Where.Conditions.Add(DQCondition.EQ(flowdetail, "DepartmentWorkFlowStateCategory_ID",long.Parse(_liuchengfenlei.Value)));
+      }
       AddGoodsCondition(goodsPropertyCatalog, goodsProperty, dom);
       dom.Columns.Add(DQSelectColumn.Field("ID", goodsProperty));
       dom.Columns.Add(DQSelectColumn.Create(DQExpression.Sum(DQExpression.Field(detail, "Number")), "主数量"));