From 4c74d8d29921e7996c7e886f6756f402ebf1a075 Mon Sep 17 00:00:00 2001 From: yibo <361071264@qq.com> Date: Wed, 10 Oct 2018 09:40:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=93=81=E7=A7=8D=E8=B7=9F=E7=BA=A7=E5=88=AB?= =?UTF-8?q?=E4=B8=8D=E5=81=9A=E5=85=B3=E8=81=94=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseInfos/Livestock_/LivestockEdit.cs | 4 +--- .../BaseInfos/Livestock_/LivestockList.cs | 6 ------ .../Bills/FixedPrice_/FixedPriceEdit.cs | 7 +------ .../Bills/WeightBill_/WeightBillEdit.cs | 3 +-- .../Reports/WeightBillAnalyse_/WeightBillAnalyse.cs | 4 +--- .../Utils/B3SheepButcherManageChoiceBoxProvider.cs | 2 -- 6 files changed, 4 insertions(+), 22 deletions(-) diff --git a/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/BaseInfos/Livestock_/LivestockEdit.cs b/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/BaseInfos/Livestock_/LivestockEdit.cs index c881ed3..e2c5c0b 100644 --- a/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/BaseInfos/Livestock_/LivestockEdit.cs +++ b/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/BaseInfos/Livestock_/LivestockEdit.cs @@ -1,5 +1,4 @@ -using BWP.B3ProduceUnitedInfos.NamedValueTemplate; -using BWP.B3SheepButcherManage; +using BWP.B3SheepButcherManage; using BWP.B3SheepButcherManage.BL; using BWP.B3SheepButcherManage.BO; using BWP.Web.CustomPageLayout; @@ -43,7 +42,6 @@ namespace BWP.Web.Pages.B3SheepButcherManage.BaseInfos.Livestock_ pageLayoutSection.ApplyLayout(layoutManager, config, mPageLayoutManager, mDFInfo); titlePanel.Controls.Add(layoutManager.CreateLayout()); - layoutManager.EnsureInputControlCreated("LiveVarieties_ID").CodeArgument = 生物资产属性.羊.Value.ToString(); } } diff --git a/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/BaseInfos/Livestock_/LivestockList.cs b/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/BaseInfos/Livestock_/LivestockList.cs index 07e5c7c..834a1bd 100644 --- a/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/BaseInfos/Livestock_/LivestockList.cs +++ b/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/BaseInfos/Livestock_/LivestockList.cs @@ -1,10 +1,8 @@ using BWP.B3Frameworks.Utils; -using BWP.B3ProduceUnitedInfos.NamedValueTemplate; using BWP.B3SheepButcherManage; using BWP.B3SheepButcherManage.BL; using BWP.B3SheepButcherManage.BO; using BWP.B3UnitedInfos.BO; -using BWP.Web.Layout; using BWP.Web.Utils; using Forks.EnterpriseServices.DomainObjects2; using Forks.EnterpriseServices.DomainObjects2.DQuery; @@ -25,22 +23,18 @@ namespace BWP.Web.Pages.B3SheepButcherManage.BaseInfos.Livestock_ var prop = new JoinAlias(typeof(GoodsProperty)); dom.From.AddJoin(JoinType.Inner, new DQDmoSource(prop), DQCondition.EQ(prop, "ID", dom.From.RootSource.Alias, "GoodsProperty_ID")); dom.Where.Conditions.Add(DQCondition.EQ(prop, "IsButchery", true)); - dom.Where.Conditions.Add(DQCondition.EQ("LiveVarieties_Nature", 生物资产属性.羊)); DomainUtil.AddDomainPermissionLimit(dom, typeof(GoodsProperty), prop); return dom; } protected override void AddQueryControls(VLayoutPanel vPanel) { - LayoutManager manage = null; vPanel.Add(CreateDefaultBaseInfoQueryControls((layoutManager, config) => { layoutManager.Add("GoodsProperty_ID", QueryCreator.DFChoiceBox(mDFInfo.Fields["GoodsProperty_ID"], B3SheepButcherManageConsts.DataSources.可屠宰存货属性)); config.AddAfter("GoodsProperty_ID", "ID"); config.Add("LiveVarieties_ID"); - manage = layoutManager; })); - manage.EnsureInputControlCreated("LiveVarieties_ID").CodeArgument = 生物资产属性.羊.Value.ToString(); } protected override void AddDFBrowseGridColumn(DFBrowseGrid grid, string field) diff --git a/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Bills/FixedPrice_/FixedPriceEdit.cs b/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Bills/FixedPrice_/FixedPriceEdit.cs index 7ff4698..aa18e9a 100644 --- a/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Bills/FixedPrice_/FixedPriceEdit.cs +++ b/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Bills/FixedPrice_/FixedPriceEdit.cs @@ -18,8 +18,6 @@ using System.Web.UI.WebControls; using TSingSoft.WebControls2; using TSingSoft.WebPluginFramework.Controls; using TSingSoft.WebPluginFramework.Exports; -using Forks.Utils.Collections; -using BWP.B3ProduceUnitedInfos.NamedValueTemplate; namespace BWP.Web.Pages.B3SheepButcherManage.Bills.FixedPrice_ { @@ -144,10 +142,7 @@ namespace BWP.Web.Pages.B3SheepButcherManage.Bills.FixedPrice_ _detailGrid.Columns.Add(new DFEditGridColumn("ValuationArea_ID")); - _detailGrid.Columns.EAdd(new DFEditGridColumn("LiveVarieties_ID")).InitEditControl += (sender, e) => - { - e.Control.CodeArgument = 生物资产属性.羊.Value.ToString(); - }; + _detailGrid.Columns.Add(new DFEditGridColumn("LiveVarieties_ID")); _detailGrid.Columns.Add(new DFEditGridColumn("Livestock_ID")); _detailGrid.Columns.Add(new DFEditGridColumn("OriginalPrice")); _detailGrid.Columns.Add(new DFEditGridColumn("Price")); diff --git a/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Bills/WeightBill_/WeightBillEdit.cs b/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Bills/WeightBill_/WeightBillEdit.cs index 3ba2e33..f0b32e7 100644 --- a/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Bills/WeightBill_/WeightBillEdit.cs +++ b/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Bills/WeightBill_/WeightBillEdit.cs @@ -173,7 +173,6 @@ __DFContainer.setValue('Supplier_Card_ID',''); liveVarieties.InitEditControl += (sender, e) => { e.Control.DataKind = B3ProduceUnitedInfos.B3ProduceUnitedInfosDataSources.活体品种; - e.Control.CodeArgument = 生物资产属性.羊.Value.ToString(); e.Control.DFDisplayField = "LiveVarieties_Name"; e.Control.Width = Unit.Pixel(150); e.Control.EnableInputArgument = true; @@ -189,7 +188,7 @@ __DFContainer.setValue('Supplier_Card_ID',''); _weightGrid.Columns.EAdd(new DFEditGridColumn("LiveColonyHouse_ID")).InitEditControl += (sender, e) => { e.Control.DataKind = B3ProduceUnitedInfos.B3ProduceUnitedInfosDataSources.活体圈舍; - e.Control.CodeArgument = 生物资产属性.牛.Value.ToString(); + e.Control.CodeArgument = 生物资产属性.羊.Value.ToString(); e.Control.DFDisplayField = "LiveColonyHouse_Name"; e.Control.Width = Unit.Pixel(150); }; diff --git a/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Reports/WeightBillAnalyse_/WeightBillAnalyse.cs b/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Reports/WeightBillAnalyse_/WeightBillAnalyse.cs index ddd2c7e..2043794 100644 --- a/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Reports/WeightBillAnalyse_/WeightBillAnalyse.cs +++ b/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Reports/WeightBillAnalyse_/WeightBillAnalyse.cs @@ -43,9 +43,7 @@ namespace BWP.Web.Pages.B3SheepButcherManage.Reports.WeightBillAnalyse_ layout.Add("WeighTime", new SimpleLabel("过磅时间"), QueryCreator.TimeRange(mDFInfo.Fields["WeighTime"], mQueryContainer, "MinDate", "MaxDate")); layout["WeighTime"].NotAutoAddToContainer = true; - DFChoiceBox lv; - layout.Add("LiveVarieties_ID", new SimpleLabel("品种"), lv = QueryCreator.DFChoiceBox(mDFInfo.Fields["AccountingUnit_ID"], B3ProduceUnitedInfos.B3ProduceUnitedInfosDataSources.活体品种)); - lv.CodeArgument = 生物资产属性.羊.Value.ToString(); + layout.Add("LiveVarieties_ID", new SimpleLabel("品种"), QueryCreator.DFChoiceBox(mDFInfo.Fields["AccountingUnit_ID"], B3ProduceUnitedInfos.B3ProduceUnitedInfosDataSources.活体品种)); layout.Add("Supplier_ID", new SimpleLabel("供应商"), QueryCreator.DFChoiceBox(mDFInfo.Fields["Supplier_ID"], B3ProcurementInterfaceDataSources.供应商全部)); layout.Add("Zone_ID", new SimpleLabel("来源地"), QueryCreator.DFChoiceBox(mDFInfo.Fields["Zone_ID"], "B3CowButcherManage_区域")); diff --git a/B3SheepButcherManage.Web/Utils/B3SheepButcherManageChoiceBoxProvider.cs b/B3SheepButcherManage.Web/Utils/B3SheepButcherManageChoiceBoxProvider.cs index 828de89..74fbf8a 100644 --- a/B3SheepButcherManage.Web/Utils/B3SheepButcherManageChoiceBoxProvider.cs +++ b/B3SheepButcherManage.Web/Utils/B3SheepButcherManageChoiceBoxProvider.cs @@ -1,7 +1,6 @@ using BWP.B3Frameworks; using BWP.B3Frameworks.BO.NamedValueTemplate; using BWP.B3Frameworks.Utils; -using BWP.B3ProduceUnitedInfos.NamedValueTemplate; using BWP.B3SheepButcherManage; using BWP.B3SheepButcherManage.BO; using BWP.B3UnitedInfos.BO; @@ -41,7 +40,6 @@ namespace BWP.Web.Utils dom.Columns.Add(DQSelectColumn.Field("ID", goods)); dom.Where.Conditions.Add(DQCondition.EQ(goodsProperty, "IsButchery", true)); dom.Where.Conditions.Add(DQCondition.EQ("Stopped", false)); - dom.Where.Conditions.Add(DQCondition.EQ("LiveVarieties_Nature", 生物资产属性.羊)); DomainUtil.AddDomainPermissionLimit(dom, typeof(GoodsProperty), goodsProperty); if (!string.IsNullOrEmpty(argu.InputArgument)) {