From f3326c1ec8af422a6d58f1ef9831b8a211d23845 Mon Sep 17 00:00:00 2001 From: wugang <425674808@qq.com> Date: Fri, 26 Jan 2018 11:05:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=98=E8=B4=A7=E5=88=86?= =?UTF-8?q?=E7=B1=BB=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SaleOrderToProductNoticePage.cs | 21 +++++++++++++++++-- .../SaleOrderToProductNoticePage.xml | 4 ---- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/ProductTask_/SaleOrderToProductNoticePage.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/ProductTask_/SaleOrderToProductNoticePage.cs index f1135ba..7d2953f 100644 --- a/BWP.B3_YunKen.Web/Pages/B3YunKen/ProductTask_/SaleOrderToProductNoticePage.cs +++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/ProductTask_/SaleOrderToProductNoticePage.cs @@ -24,6 +24,7 @@ using Forks.EnterpriseServices.BusinessInterfaces; using BWP.B3Butchery.BL; using BWP.B3Butchery.BO; using BWP.Web.Pages.Utils; +using Forks.EnterpriseServices.SqlDoms; namespace BWP.Web.Pages.B3YunKen.ProductTask_ { @@ -39,7 +40,7 @@ namespace BWP.Web.Pages.B3YunKen.ProductTask_ protected static DFInfo mGoodsDFInfo = DFInfo.Get(typeof(Goods)); protected static DFInfo mPropDFInfo = DFInfo.Get(typeof(GoodsProperty)); - private DFChoiceBox ccbxEmployeeUnit, ccbxDepartment, ccbxProductionUnit, ccbxAccountingUnit; + private DFChoiceBox ccbxEmployeeUnit, ccbxDepartment, ccbxProductionUnit, ccbxAccountingUnit, ccbxGoodsPropertyCatalog; private DFDateInput cDateInput; private DFTextBox ccbxRemark; @@ -285,7 +286,8 @@ namespace BWP.Web.Pages.B3YunKen.ProductTask_ cbxHideAlready = new DFCheckBox() { Text = "隐藏已转明细", Checked = true }; manager.Add("隐藏已转明细", cbxHideAlready); manager["隐藏已转明细"].NoLabel = true; - + manager.Add("GoodsPropertyCatalog_ID", new SimpleLabel("存货属性分类"), ccbxGoodsPropertyCatalog = QueryCreator.DFChoiceBox(mPropDFInfo.Fields["GoodsPropertyCatalog_ID"], B3UnitedInfosConsts.DataSources.存货属性分类)); + //layout["GoodsPropertyCatalog_ID"].NotAutoAddToContainer = true; manager.CreateDefaultConfig(8); panel.Controls.Add(manager.CreateLayout()); @@ -346,6 +348,21 @@ namespace BWP.Web.Pages.B3YunKen.ProductTask_ { dom.Where.Conditions.Add(DQCondition.Or(DQCondition.IsNull(DQExpression.Field(detail, "B3Butcher_UnitNum")), DQCondition.LessThan(DQExpression.IfNull(DQExpression.Field(detail, "B3Butcher_UnitNum"), DQExpression.Value(0)), DQExpression.IfNull(DQExpression.Field(detail, "UnitNum"), DQExpression.Value(0))))); } + if (!ccbxGoodsPropertyCatalog.IsEmpty) { + var goodsProperty = JoinAlias.Create("prop"); + var goodsPropertyCatalog = new JoinAlias(typeof(GoodsPropertyCatalog)); + dom.From.AddJoin(JoinType.Left, new DQDmoSource(goodsPropertyCatalog), DQCondition.EQ(goodsProperty, "GoodsPropertyCatalog_ID", goodsPropertyCatalog, "ID")); + + var strs = B3SaleWebUtil.GetDeepByTreeName(ccbxGoodsPropertyCatalog.DisplayValue); + var conditions = new List(); + var values = ccbxGoodsPropertyCatalog.GetValues(); + + for (int index = 0; index < values.Length; index++) { + var value = values[index]; + conditions.Add(DQCondition.EQ(goodsPropertyCatalog, "TreeDeep" + strs[index] + "ID", value)); + } + dom.Where.Conditions.Add(DQCondition.Or(conditions)); + } return dom; } diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/ProductTask_/SaleOrderToProductNoticePage.xml b/BWP.B3_YunKen.Web/Pages/B3YunKen/ProductTask_/SaleOrderToProductNoticePage.xml index c09a7ee..3273c82 100644 --- a/BWP.B3_YunKen.Web/Pages/B3YunKen/ProductTask_/SaleOrderToProductNoticePage.xml +++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/ProductTask_/SaleOrderToProductNoticePage.xml @@ -69,10 +69,6 @@ - - - -