品种跟级别不做关联。

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<DFChoiceBox>("LiveVarieties_ID").CodeArgument = 生物资产属性.羊.Value.ToString();
     }
 
   }

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<DFChoiceBox>("LiveVarieties_ID").CodeArgument = 生物资产属性.羊.Value.ToString();
     }
 
     protected override void AddDFBrowseGridColumn(DFBrowseGrid grid, string field)

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<DFChoiceBox>("LiveVarieties_ID")).InitEditControl += (sender, e) =>
-      {
-        e.Control.CodeArgument = 生物资产属性.羊.Value.ToString();
-      };
+      _detailGrid.Columns.Add(new DFEditGridColumn<DFChoiceBox>("LiveVarieties_ID"));
       _detailGrid.Columns.Add(new DFEditGridColumn("Livestock_ID"));
       _detailGrid.Columns.Add(new DFEditGridColumn<DFValueLabel>("OriginalPrice"));
       _detailGrid.Columns.Add(new DFEditGridColumn("Price"));

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<DFChoiceBox>("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);
       };

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_区域"));

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))
         {