diff --git a/B3SheepButcherManage.Web/B3SheepButcherManage.Web.csproj b/B3SheepButcherManage.Web/B3SheepButcherManage.Web.csproj
index 430de15..5bf4aad 100644
--- a/B3SheepButcherManage.Web/B3SheepButcherManage.Web.csproj
+++ b/B3SheepButcherManage.Web/B3SheepButcherManage.Web.csproj
@@ -11,7 +11,7 @@
B3SheepButcherManage.Web
v4.0
512
- BwpApp
+ BwpApp
true
@@ -109,12 +109,6 @@
-
- ASPXCodeBehind
-
-
- ASPXCodeBehind
-
ASPXCodeBehind
@@ -207,10 +201,10 @@
+
-
diff --git a/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/BaseInfos/Livestock_/LivestockEdit.cs b/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/BaseInfos/Livestock_/LivestockEdit.cs
deleted file mode 100644
index fe605c7..0000000
--- a/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/BaseInfos/Livestock_/LivestockEdit.cs
+++ /dev/null
@@ -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
- {
-
- 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());
- }
-
- }
-}
-
diff --git a/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/BaseInfos/Livestock_/LivestockList.cs b/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/BaseInfos/Livestock_/LivestockList.cs
deleted file mode 100644
index 3f17a8b..0000000
--- a/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/BaseInfos/Livestock_/LivestockList.cs
+++ /dev/null
@@ -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
- {
- 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");
- }
-
- }
-
- }
-}
\ No newline at end of file
diff --git a/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/BaseInfos/Livestock_/LivestockList.xml b/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/BaseInfos/Livestock_/LivestockList.xml
deleted file mode 100644
index f14ca4d..0000000
--- a/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/BaseInfos/Livestock_/LivestockList.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
diff --git a/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Bills/Butcher_/ButcherEdit.cs b/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Bills/Butcher_/ButcherEdit.cs
index f09c073..a81898d 100644
--- a/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Bills/Butcher_/ButcherEdit.cs
+++ b/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("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;
};
diff --git a/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Bills/HurryButcher_/HurryButcherEdit.cs b/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Bills/HurryButcher_/HurryButcherEdit.cs
index d81f796..212f0e2 100644
--- a/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Bills/HurryButcher_/HurryButcherEdit.cs
+++ b/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;
};
diff --git a/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Bills/StatPay_/StatPayEdit.cs b/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Bills/StatPay_/StatPayEdit.cs
index 2894226..71f7b89 100644
--- a/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Bills/StatPay_/StatPayEdit.cs
+++ b/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Bills/StatPay_/StatPayEdit.cs
@@ -222,7 +222,7 @@ __DFContainer.getControl('Employee_ID').fill('','');
_butcherGrid.Columns.EAdd(new DFEditGridColumn("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;
};
diff --git a/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Reports/ButcherAnalyse_/ButcherAnalyse.cs b/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Reports/ButcherAnalyse_/ButcherAnalyse.cs
index f7325d4..9b91e8b 100644
--- a/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Reports/ButcherAnalyse_/ButcherAnalyse.cs
+++ b/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 = 单据状态.已审核;
diff --git a/B3SheepButcherManage.Web/Utils/B3SheepButcherManageChoiceBoxProvider.cs b/B3SheepButcherManage.Web/Utils/B3SheepButcherManageChoiceBoxProvider.cs
index 1430b67..a708a53 100644
--- a/B3SheepButcherManage.Web/Utils/B3SheepButcherManageChoiceBoxProvider.cs
+++ b/B3SheepButcherManage.Web/Utils/B3SheepButcherManageChoiceBoxProvider.cs
@@ -20,34 +20,6 @@ namespace BWP.Web.Utils
{
public static void Register()
{
- ChoiceBoxSettings.Register(B3SheepButcherManageConsts.DataSources.可屠宰存货属性, (argu) =>
- new ChoiceBoxQueryHelper(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().Select(x => new WordPair(x.Item1.ToString(), x.Item2.ToString()));
- });
-
ChoiceBoxSettings.Register(B3SheepButcherManageConsts.DataSources.已审核过磅单, argu =>
{
var weightBill = new JoinAlias(typeof(WeightBill));
diff --git a/B3SheepButcherManage/B3SheepButcherManage.csproj b/B3SheepButcherManage/B3SheepButcherManage.csproj
index 3853caa..e2d29f6 100644
--- a/B3SheepButcherManage/B3SheepButcherManage.csproj
+++ b/B3SheepButcherManage/B3SheepButcherManage.csproj
@@ -11,7 +11,7 @@
B3SheepButcherManage
v4.0
512
- BwpApp
+ BwpApp
true
@@ -88,14 +88,12 @@
-
-
@@ -121,7 +119,10 @@
-
+
+
+
+
-