级别挪到牛模块，羊模块依赖牛模块，

B3SheepButcherManage.Web/B3SheepButcherManage.Web.csproj

@@ -11,7 +11,7 @@
     <AssemblyName>B3SheepButcherManage.Web</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-	    <KeyContainerName>BwpApp</KeyContainerName>
+    <KeyContainerName>BwpApp</KeyContainerName>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -109,12 +109,6 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Pages\B3SheepButcherManage\BaseInfos\Livestock_\LivestockEdit.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Pages\B3SheepButcherManage\BaseInfos\Livestock_\LivestockList.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
     <Compile Include="Pages\B3SheepButcherManage\Bills\Butcher_\ButcherEdit.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
@@ -207,10 +201,10 @@
     <Compile Include="Utils\B3SheepButcherManageChoiceBoxProvider.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Folder Include="Pages\B3SheepButcherManage\BaseInfos\" />
     <Folder Include="Pages\B3SheepButcherManage\Dialogs\" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Pages\B3SheepButcherManage\BaseInfos\Livestock_\LivestockList.xml" />
     <EmbeddedResource Include="Pages\B3SheepButcherManage\Bills\FixedPrice_\FixedPriceList.xml" />
   </ItemGroup>
   <ItemGroup>

B3SheepButcherManage.Web/Pages/B3SheepButcherManage/BaseInfos/Livestock_/LivestockEdit.cs

@@ -1,51 +0,0 @@
-using BWP.B3SheepButcherManage;
-using BWP.B3SheepButcherManage.BL;
-using BWP.B3SheepButcherManage.BO;
-using BWP.Web.CustomPageLayout;
-using BWP.Web.Layout;
-using BWP.Web.Utils;
-using BWP.Web.WebControls;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using TSingSoft.WebControls2;
-
-namespace BWP.Web.Pages.B3SheepButcherManage.BaseInfos.Livestock_
-{
-  class LivestockEdit : BaseInfoEditPage<Livestock, ILivestockBL>
-  {
-
-    protected override void BuildBasePropertiesEditor(TitlePanel titlePanel, PageLayoutSection pageLayoutSection)
-    {
-      var layoutManager = new LayoutManager("", mDFInfo, mDFContainer);
-      layoutManager.Add("GoodsProperty_ID", InputCreator.DFChoiceBox(B3SheepButcherManageConsts.DataSources.可屠宰存货属性, "GoodsProperty_Name"));
-      var config = new AutoLayoutConfig();
-      layoutManager.Config = config;
-      config.Add("GoodsProperty_ID");
-      config.Add("Name");
-      config.Add("Code");
-      config.Add("LiveVarieties_ID");
-      config.Add("Shortcut");
-      config.Add("SortNum");
-
-      config.Add("PrintShortName");
-      config.Add("Spec");
-      config.Add("Feature");
-      config.Add("Origin");
-      config.Add("Brand");
-      config.Add("TaxRate");
-      config.Add("MainUnit");
-      config.Add("SecondUnit");
-
-      config.Add("Remark");
-
-      pageLayoutSection.SetRequired("GoodsProperty_ID", "Name", "Code");
-      pageLayoutSection.ApplyLayout(layoutManager, config, mPageLayoutManager, mDFInfo);
-
-      titlePanel.Controls.Add(layoutManager.CreateLayout());
-    }
-
-  }
-}
-

B3SheepButcherManage.Web/Pages/B3SheepButcherManage/BaseInfos/Livestock_/LivestockList.cs

@@ -1,53 +0,0 @@
-using BWP.B3Frameworks.Utils;
-using BWP.B3SheepButcherManage;
-using BWP.B3SheepButcherManage.BL;
-using BWP.B3SheepButcherManage.BO;
-using BWP.B3UnitedInfos.BO;
-using BWP.Web.Utils;
-using Forks.EnterpriseServices.DomainObjects2;
-using Forks.EnterpriseServices.DomainObjects2.DQuery;
-using Forks.EnterpriseServices.SqlDoms;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using TSingSoft.WebControls2;
-
-namespace BWP.Web.Pages.B3SheepButcherManage.BaseInfos.Livestock_
-{
-  class LivestockList : BaseInfoListPage<Livestock, ILivestockBL>
-  {
-    protected override DQueryDom GetQueryDom()
-    {
-      var dom = base.GetQueryDom();
-      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.OrderBy.Expressions.Add(DQOrderByExpression.Create("SortNum", false));
-      DomainUtil.AddDomainPermissionLimit(dom, typeof(GoodsProperty), prop);
-      return dom;
-    }
-
-    protected override void AddQueryControls(VLayoutPanel vPanel)
-    {
-      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");
-      }));
-    }
-
-    protected override void AddDFBrowseGridColumn(DFBrowseGrid grid, string field)
-    {
-      base.AddDFBrowseGridColumn(grid, field);
-      if (field == "Name")
-      {
-        AddDFBrowseGridColumn(grid, "LiveVarieties_Name");
-        AddDFBrowseGridColumn(grid, "SortNum");
-      }
-
-    }
-
-  }
-}

B3SheepButcherManage.Web/Pages/B3SheepButcherManage/BaseInfos/Livestock_/LivestockList.xml

@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Select xmlns="urn:XDQuery">
-  <Columns>
-    <Field name="ID"/>
-  </Columns>
-  <From>
-    <DmoClass class="BWP.B3SheepButcherManage.BO.Livestock, B3SheepButcherManage"/>
-  </From>
-  <Where>
-    <And>
-      <EQ>
-        <Field name="ID"/>
-        <QBE paramName="ID"/>
-      </EQ>
-      <EQ>
-        <Field name="GoodsProperty_ID"/>
-        <QBE paramName="GoodsProperty_ID"/>
-      </EQ>
-      <EQ>
-        <Field name="LiveVarieties_ID"/>
-        <QBE paramName="LiveVarieties_ID"/>
-      </EQ>
-      <Or>
-        <Contains>
-          <Field name="Name"/>
-          <QBE paramName="Name"/>
-        </Contains>
-        <Contains>
-          <Field name="Spell"/>
-          <QBE paramName="Name"/>
-        </Contains>
-      </Or>
-      <Contains>
-        <Field name="Code"/>
-        <QBE paramName="Code"/>
-      </Contains>
-      <Contains>
-        <Field name="Brand"/>
-        <QBE paramName="Brand"/>
-      </Contains>
-      <EQ>
-        <Field name="Stopped"/>
-        <QBE paramName="Stopped"/>
-      </EQ>
-      <EQ>
-        <Field name="IsLocked"/>
-        <QBE paramName="IsLocked"/>
-      </EQ>
-      <Contains>
-        <Field name="Remark"/>
-        <QBE paramName="Remark"/>
-      </Contains>
-    </And>
-  </Where>
-</Select>

B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Bills/Butcher_/ButcherEdit.cs

@@ -17,6 +17,7 @@ using TSingSoft.WebControls2;
 using TSingSoft.WebPluginFramework;
 using Forks.Utils.Collections;
 using BWP.B3SheepButcherManage;
+using BWP.B3CowButcherManage;
 
 namespace BWP.Web.Pages.B3SheepButcherManage.Bills.Butcher_
 {
@@ -91,7 +92,7 @@ namespace BWP.Web.Pages.B3SheepButcherManage.Bills.Butcher_
       _detailGrid.Columns.EAdd(new DFEditGridColumn<DFChoiceBox>("Livestock_ID")).InitEditControl += (sender, e) =>
       {
         e.Control.EnableInputArgument = true;
-        e.Control.DataKind = B3SheepButcherManageConsts.DataSources.活体级别;
+        e.Control.DataKind = B3CowButcherManageConsts.DataSources.活体级别;
         e.Control.DFDisplayField = "Livestock_Name";
         e.Control.Width = 180;
       };

B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Bills/HurryButcher_/HurryButcherEdit.cs

@@ -1,4 +1,5 @@
-using BWP.B3ProduceUnitedInfos.NamedValueTemplate;
+using BWP.B3CowButcherManage;
+using BWP.B3ProduceUnitedInfos.NamedValueTemplate;
 using BWP.B3SheepButcherManage;
 using BWP.B3SheepButcherManage.BL;
 using BWP.B3SheepButcherManage.BO;
@@ -110,7 +111,7 @@ namespace BWP.Web.Pages.B3SheepButcherManage.Bills.HurryButcher_
       {
         e.Control.EnableTopItem = true;
         e.Control.EnableInputArgument = true;
-        e.Control.DataKind = B3SheepButcherManageConsts.DataSources.活体级别;
+        e.Control.DataKind = B3CowButcherManageConsts.DataSources.活体级别;
         e.Control.DFDisplayField = "Livestock_Name";
         e.Control.Width = 160;
       };

B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Bills/StatPay_/StatPayEdit.cs

@@ -222,7 +222,7 @@ __DFContainer.getControl('Employee_ID').fill('','');
       _butcherGrid.Columns.EAdd(new DFEditGridColumn<DFChoiceBox>("Livestock_ID")).InitEditControl += (sender, e) =>
       {
         e.Control.EnableInputArgument = true;
-        e.Control.DataKind = B3SheepButcherManageConsts.DataSources.活体级别;
+        e.Control.DataKind = B3CowButcherManageConsts.DataSources.活体级别;
         e.Control.DFDisplayField = "Livestock_Name";
         e.Control.Width = 180;
       };

B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Reports/ButcherAnalyse_/ButcherAnalyse.cs

@@ -56,7 +56,7 @@ namespace BWP.Web.Pages.B3SheepButcherManage.Reports.ButcherAnalyse_
       customPanel.Add("AccountingUnit_ID", new SimpleLabel("会计单位"), QueryCreator.DFChoiceBox(_weigh.Fields["AccountingUnit_ID"], B3FrameworksConsts.DataSources.授权会计单位全部));
       customPanel.Add("Zone_ID", new SimpleLabel("来源区域"), QueryCreator.DFChoiceBox(_weigh.Fields["Zone_ID"], "B3ButcherManage_区域"));
       customPanel.Add("WeightBill_ID", QueryCreator.DFTextBox(_mDFInfo.Fields["WeightBill_ID"]));
-      customPanel.Add("Livestock_ID", QueryCreator.DFChoiceBox(_mDFInfo.Fields["Livestock_ID"], BWP.B3SheepButcherManage.B3SheepButcherManageConsts.DataSources.活体级别));
+      customPanel.Add("Livestock_ID", QueryCreator.DFChoiceBox(_mDFInfo.Fields["Livestock_ID"], BWP.B3CowButcherManage.B3CowButcherManageConsts.DataSources.活体级别));
       DFNamedValueInput<单据状态> billStateInput;
       customPanel.Add("BillState", new SimpleLabel("单据状态"), billStateInput = QueryCreator.一般单据状态(_butcher.Fields["BillState"]));
       billStateInput.Value = 单据状态.已审核;

B3SheepButcherManage.Web/Utils/B3SheepButcherManageChoiceBoxProvider.cs

@@ -20,34 +20,6 @@ namespace BWP.Web.Utils
   {
     public static void Register()
     {
-      ChoiceBoxSettings.Register(B3SheepButcherManageConsts.DataSources.可屠宰存货属性, (argu) =>
-       new ChoiceBoxQueryHelper<GoodsProperty>(argu, true)
-       {
-         BeforeQuery = query =>
-         {
-           query.Where.Conditions.Add(DQCondition.EQ("IsButchery", true));
-           DomainUtil.AddDomainPermissionLimit(query);
-         }
-       }.GetData());
-
-      ChoiceBoxSettings.Register(B3SheepButcherManageConsts.DataSources.活体级别, argu =>
-      {
-        var goods = new JoinAlias(typeof(Livestock));
-        var goodsProperty = new JoinAlias(typeof(GoodsProperty));
-        var dom = new DQueryDom(goods);
-        dom.From.AddJoin(JoinType.Left, new DQDmoSource(goodsProperty), DQCondition.EQ(goods, "GoodsProperty_ID", goodsProperty, "ID"));
-        dom.Columns.Add(DQSelectColumn.Field("Name", goods));
-        dom.Columns.Add(DQSelectColumn.Field("ID", goods));
-        dom.Where.Conditions.Add(DQCondition.EQ(goodsProperty, "IsButchery", true));
-        dom.Where.Conditions.Add(DQCondition.EQ("Stopped", false));
-        DomainUtil.AddDomainPermissionLimit(dom, typeof(GoodsProperty), goodsProperty);
-        if (!string.IsNullOrEmpty(argu.InputArgument))
-        {
-          dom.Where.Conditions.Add(DQCondition.Or(DQCondition.Like("Name", argu.InputArgument), DQCondition.Like("Spell", argu.InputArgument), DQCondition.Like("Code", argu.InputArgument)));
-        }
-        return dom.EExecuteList<string, long>().Select(x => new WordPair(x.Item1.ToString(), x.Item2.ToString()));
-      });
-
       ChoiceBoxSettings.Register(B3SheepButcherManageConsts.DataSources.已审核过磅单, argu =>
       {
         var weightBill = new JoinAlias(typeof(WeightBill));

B3SheepButcherManage/B3SheepButcherManage.csproj

@@ -11,7 +11,7 @@
     <AssemblyName>B3SheepButcherManage</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-	    <KeyContainerName>BwpApp</KeyContainerName>
+    <KeyContainerName>BwpApp</KeyContainerName>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -88,14 +88,12 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="BL\BaseInfo\LivestockBL.cs" />
     <Compile Include="BL\Bill\ButcherBL\ButcherBL.cs" />
     <Compile Include="BL\Bill\FixedPriceBL\FixedPriceBL.cs" />
     <Compile Include="BL\Bill\HurryButcherBL\HurryButcherBL.cs" />
     <Compile Include="BL\Bill\PayBL\PayBL.cs" />
     <Compile Include="BL\Bill\StatPayBL\StatPayBL.cs" />
     <Compile Include="BL\Bill\WeightBillBL\WeightBillBL.cs" />
-    <Compile Include="BO\BaseInfo\Livestock.cs" />
     <Compile Include="BO\Bill\Butcher\Butcher.cs" />
     <Compile Include="BO\Bill\Butcher\Butcher_Detail.cs" />
     <Compile Include="BO\Bill\FixedPrice\FixedPrice.cs" />
@@ -121,7 +119,10 @@
     <Compile Include="Utils\B3SheepButcherManageConfig.cs" />
     <Compile Include="Utils\WeightUtil.cs" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Folder Include="BL\BaseInfo\" />
+    <Folder Include="BO\BaseInfo\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

B3SheepButcherManage/BL/BaseInfo/LivestockBL.cs

@@ -1,32 +0,0 @@
-using BWP.B3Frameworks.BL;
-using BWP.B3SheepButcherManage.BO;
-using Forks.EnterpriseServices;
-using Forks.EnterpriseServices.BusinessInterfaces;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace BWP.B3SheepButcherManage.BL
-{
-  [BusinessInterface(typeof(LivestockBL))]
-  [LogicName("级别")]
-  public interface ILivestockBL : IBaseInfoBL<Livestock>
-  {
-
-  }
-
-  public class LivestockBL : BaseInfoBL<Livestock>, ILivestockBL
-  {
-
-    protected override void beforeSave(Livestock dmo)
-    {
-      if (dmo.GoodsProperty_ID == null)
-      {
-        throw new Exception("必须设置畜类属性(存货属性)");
-      }
-      base.beforeSave(dmo);
-    }
-
-  }
-}

B3SheepButcherManage/BO/BaseInfo/Livestock.cs

@@ -1,25 +0,0 @@
-using BWP.B3Frameworks;
-using BWP.B3ProduceUnitedInfos;
-using BWP.B3ProduceUnitedInfos.BO;
-using BWP.B3ProduceUnitedInfos.NamedValueTemplate;
-using Forks.EnterpriseServices;
-using Forks.EnterpriseServices.DataForm;
-using Forks.EnterpriseServices.DomainObjects2;
-using Forks.Utils;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace BWP.B3SheepButcherManage.BO
-{
-  [DFClass, Serializable]
-  [LogicName("级别")]
-  [MapToTable("B3UnitedInfos_Goods")]
-  [DmoTypeID(B3FrameworksConsts.DmoTypeIDBases.B3SheepButcherManage, B3SheepButcherManageConsts.DmoTypeIDOffsets.Livestock)]
-  [DFCPrompt("畜类属性", Property = "GoodsProperty_ID")]
-  [DFCPrompt("畜类属性", Property = "GoodsProperty_Name")]
-  public class Livestock : B3ProduceUnitedInfos.BO.GoodsExt
-  {
-  }
-}

B3SheepButcherManage/BO/Bill/Butcher/Butcher_Detail.cs

@@ -1,4 +1,5 @@
-using BWP.B3Frameworks.BO;
+using BWP.B3CowButcherManage.BO;
+using BWP.B3Frameworks.BO;
 using BWP.B3ProduceUnitedInfos.BO;
 using Forks.EnterpriseServices;
 using Forks.EnterpriseServices.DataDictionary;

B3SheepButcherManage/BO/Bill/FixedPrice/FixedPrice_Detail.cs

@@ -47,7 +47,7 @@ namespace BWP.B3SheepButcherManage.BO
 
     [LogicName("级别")]
     [DFExtProperty("WebControlType", DFEditControl.ChoiceBox)]
-    [DFDataKind(B3SheepButcherManageConsts.DataSources.活体级别)]
+    [DFDataKind(B3CowButcherManageConsts.DataSources.活体级别)]
     [DFExtProperty(B3FrameworksConsts.DFExtProperties.DisplayField, "Livestock_Name")]
     public long? Livestock_ID { get; set; }
 

B3SheepButcherManage/BO/Bill/HurryButcher/HurryButcher_Detail.cs

@@ -1,4 +1,5 @@
-using BWP.B3Frameworks.BO;
+using BWP.B3CowButcherManage.BO;
+using BWP.B3Frameworks.BO;
 using BWP.B3ProduceUnitedInfos.BO;
 using BWP.B3SheepButcherManage.NamedValueTemplate;
 using Forks.EnterpriseServices;

B3SheepButcherManage/BO/Bill/StatPay/StatPay_Butcher.cs

@@ -1,4 +1,5 @@
-using BWP.B3Frameworks.BO;
+using BWP.B3CowButcherManage.BO;
+using BWP.B3Frameworks.BO;
 using BWP.B3Frameworks.BO.MoneyTemplate;
 using BWP.B3ProduceUnitedInfos.BO;
 using Forks.EnterpriseServices;

B3SheepButcherManage/BO/Bill/StatPay/StatPay_HurryButcher.cs

@@ -1,4 +1,5 @@
-using BWP.B3Frameworks.BO;
+using BWP.B3CowButcherManage.BO;
+using BWP.B3Frameworks.BO;
 using BWP.B3Frameworks.BO.MoneyTemplate;
 using BWP.B3ProduceUnitedInfos.BO;
 using Forks.EnterpriseServices;

B3SheepButcherManage/DmoTypeIDOffsets.cs

@@ -9,7 +9,6 @@ namespace BWP.B3SheepButcherManage
   {
     internal static class DmoTypeIDOffsets
     {
-      public const byte Livestock = 1;
       public const byte FixedPrice = 2;
       public const byte WeightBill = 3;
       public const byte ButcherOrder = 4;
@@ -22,8 +21,6 @@ namespace BWP.B3SheepButcherManage
     public static class DataSources
     {
       internal const string Prefix = "B3SheepButcherManager_";
-      public const string 可屠宰存货属性 = Prefix + "可屠宰存货属性";
-      public const string 活体级别 = Prefix + "活体级别";
       public const string 已审核过磅单 = Prefix + "已审核过磅单";
     }
 

WebFolder/config/Plugins/B3SheepButcherManage.Plugin

@@ -20,16 +20,6 @@
   <Profiles>
   </Profiles>
   <Security>
-    <FunctionGroup name="级别" roleSchemas="employee">
-      <Function index="0" name="访问"/>
-      <Function index="1" name="新建"/>
-      <Function index="2" name="编辑"/>
-      <Function index="3" name="删除"/>
-      <Function index="4" name="停用"/>
-      <Function index="5" name="启用"/>
-      <Function index="6" name="锁定"/>
-      <Function index="7" name="解锁"/>
-    </FunctionGroup>
     <FunctionGroup name="羊定价单" roleSchemas="employee">
       <Function index="0" name="访问" />
       <Function index="1" name="新建" />
@@ -137,7 +127,6 @@
     </FunctionGroup>-->
   </Security>
   <Menus>
-    <Menu id="0001" name="/B3羊屠宰场管理/基础档案/级别" roles="B3SheepButcherManage.级别.访问" url="B3SheepButcherManage/BaseInfos/Livestock_/LivestockList.aspx"/>
     <Menu id="0002" name="/B3羊屠宰场管理/业务单据/羊定价单" roles="B3SheepButcherManage.羊定价单.访问" url="B3SheepButcherManage/Bills/FixedPrice_/FixedPriceList.aspx"/>
     <Menu id="0003" features="B3SheepButcherManage.0001" name="/B3羊屠宰场管理/业务单据/羊过磅单" roles="B3SheepButcherManage.羊过磅单.访问" url="B3SheepButcherManage/Bills/WeightBill_/WeightBillList.aspx"/>
     <Menu id="0004" features="B3SheepButcherManage.0003" name="/B3羊屠宰场管理/业务单据/羊排宰" roles="B3SheepButcherManage.羊屠宰单.访问" url="B3SheepButcherManage/Bills/Butcher_/CreateButcher.aspx"/>