diff --git a/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateEdit.cs b/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateEdit.cs index dd0f306..9c849a2 100644 --- a/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateEdit.cs +++ b/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateEdit.cs @@ -390,14 +390,20 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools { var customer = new JoinAlias("_c", typeof(Customer)); //var storeDetail = new JoinAlias(typeof(StoreDetailTmp)); //var output = new JoinAlias(typeof(OutputTmp)); + var flowdetail = new JoinAlias("flowdetail", typeof(DepartmentWorkFlow_Detail)); + dom.From.AddJoin(JoinType.Inner, new DQDmoSource(detailAlias), DQCondition.EQ(order, "ID", detailAlias, "Order_ID")); dom.From.AddJoin(JoinType.Left, new DQDmoSource(goods), DQCondition.EQ(detailAlias, "SaleGoods_ID", goods, "ID")); 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(order, "Customer_ID", customer, "ID")); + + dom.From.AddJoin(JoinType.Left, new DQDmoSource(flowdetail), DQCondition.EQ(order, "DepartmentWorkFlow_Detail_ID", flowdetail, "ID")); + OrganizationUtil.RegisterOrganizationQueryTable(dom); + //dom.RegisterQueryTable(typeof(StoreDetailTmp), new[] { "GoodsProperty_ID", "Number", "SecondNumber" }, GetStoreDetailDQueryDom()); //dom.RegisterQueryTable(typeof(OutputTmp), new[] { "GoodsProperty_ID", "Number" }, GetOutputDQueryDom()); //dom.From.AddJoin(JoinType.Left, new DQDmoSource(storeDetail), DQCondition.EQ(goodsProperty, "ID", storeDetail, "GoodsProperty_ID"));