BWPB3
/
B3SheepButcherManage
9
0
Fork 0
Code Issues 0 Pull Requests 0 Activity
Browse Source

增加羊急宰单报表

master
duanluohua 7 years ago
parent
a5f0631f26
commit
1a8327cda6
7 changed files with 340 additions and 150 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +6
    -0
      B3SheepButcherManage.Web/B3SheepButcherManage.Web.csproj
  2. +5
    -4
      B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Bills/HurryButcher_/HurryButcherEdit.cs
  3. +9
    -0
      B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Bills/HurryButcher_/HurryButcherList.cs
  4. +149
    -144
      B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Bills/StatPay_/SelectHurryButcherDialog.cs
  5. +115
    -0
      B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Reports/HurryButcherAnalyse_/HurryButcherAnalyse.cs
  6. +54
    -0
      B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Reports/HurryButcherAnalyse_/HurryButcherAnalyse.xml
  7. +2
    -2
      B3SheepButcherManage/BL/Bill/StatPayBL/StatPayBL.cs

+ 6
- 0
B3SheepButcherManage.Web/B3SheepButcherManage.Web.csproj View File

@ -174,6 +174,9 @@
<Compile Include="Pages\B3SheepButcherManage\Reports\ButcherAnalyse_\ButcherAnalyse.cs">
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Pages\B3SheepButcherManage\Reports\HurryButcherAnalyse_\HurryButcherAnalyse.cs">
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Pages\B3SheepButcherManage\Reports\StatPayAnalyse_\StatPayAnalyse.cs">
<SubType>ASPXCodeBehind</SubType>
</Compile>
@ -229,6 +232,9 @@
<EmbeddedResource Include="Pages\B3SheepButcherManage\Bills\HurryButcher_\HurryButcherList.xml" />
<EmbeddedResource Include="Pages\B3SheepButcherManage\Bills\HurryButcher_\SelectHurryButcherDetailDialog.xml" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Pages\B3SheepButcherManage\Reports\HurryButcherAnalyse_\HurryButcherAnalyse.xml" />
</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.


+ 5
- 4
B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Bills/HurryButcher_/HurryButcherEdit.cs View File

@ -1,4 +1,5 @@
using BWP.B3SheepButcherManage;
using BWP.B3ProduceUnitedInfos.NamedValueTemplate;
using BWP.B3SheepButcherManage;
using BWP.B3SheepButcherManage.BL;
using BWP.B3SheepButcherManage.BO;
using BWP.B3SheepButcherManage.NamedValueTemplate;
@ -99,11 +100,11 @@ namespace BWP.Web.Pages.B3SheepButcherManage.Bills.HurryButcher_
};
_detailGrid.Columns.EAdd(new DFEditGridColumn<DFChoiceBox>("LiveVarieties_ID")).InitEditControl += (sender, e) =>
{
e.Control.EnableTopItem = true;
e.Control.EnableInputArgument = true;
e.Control.DataKind = B3ProduceUnitedInfos.B3ProduceUnitedInfosDataSources.活体品种;
e.Control.DFDisplayField = "LiveVarieties_Name";
e.Control.Width = 160;
e.Control.Width = Unit.Pixel(150);
e.Control.EnableInputArgument = true;
e.Control.CodeArgument = 生物资产属性.羊.Value.ToString();
};
_detailGrid.Columns.EAdd(new DFEditGridColumn<DFChoiceBox>("Livestock_ID")).InitEditControl += (sender, e) =>
{


+ 9
- 0
B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Bills/HurryButcher_/HurryButcherList.cs View File

@ -35,5 +35,14 @@ namespace BWP.Web.Pages.B3SheepButcherManage.Bills.HurryButcher_
AddDFBrowseGridColumn(grid, "Remark");
}
}
protected override void InitToolBar(HLayoutPanel toolbar)
{
base.InitToolBar(toolbar);
var button = new TSButton("数据分析") { UseSubmitBehavior = false };
button.OnClientClick = "preventEventDefault(event);OpenUrlInTopTab('B3SheepButcherManage/Reports/HurryButcherAnalyse_/HurryButcherAnalyse.aspx','数据分析');";
toolbar.Add(button);
}
}
}

+ 149
- 144
B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Bills/StatPay_/SelectHurryButcherDialog.cs View File

@ -1,154 +1,159 @@
using System;
using System.Collections.Generic;
using BWP.B3Frameworks.BO.NamedValueTemplate;
using BWP.B3Frameworks.Utils;
using BWP.B3ProcurementInterface.Utils;
using BWP.B3SheepButcherManage.BL;
using BWP.B3SheepButcherManage.BO;
using BWP.Web.Utils;
using Forks.EnterpriseServices.BusinessInterfaces;
using Forks.EnterpriseServices.DataForm;
using Forks.EnterpriseServices.DomainObjects2;
using Forks.EnterpriseServices.DomainObjects2.DQuery;
using Forks.EnterpriseServices.SqlDoms;
using System;
using System.Linq;
using System.Text;
using TSingSoft.WebPluginFramework.Pages;
using System.Web.UI;
using System.Web.UI.WebControls;
using TSingSoft.WebControls2;
namespace BWP.Web.Pages.B3SheepButcherManage.Bills.StatPay_
{
class SelectHurryButcherDialog:ServerPage //: DmoMultiSelectDialog<HurryButcher, StatPay_HurryButcher>
class SelectHurryButcherDialog : DmoMultiSelectDialog<HurryButcher, StatPay_HurryButcher>
{
//long? DmoID
//{
// get
// {
// var strW = Request.QueryString["DmoID"];
// if (string.IsNullOrEmpty(strW))
// return null;
// return long.Parse(strW);
// }
//}
//DFCheckBox _hideSelected;
//protected override void CreateQuery(VLayoutPanel vPanel)
//{
// var tablePanel = new TableLayoutPanel(8, 2);
// vPanel.Add(tablePanel);
// tablePanel.Add(0, 1, 0, 1, new DFLabel(mDFInfo.Fields["ID"], 4));
// tablePanel.Add(1, 2, 0, 1, mQueryContainer.Add(new DFTextBox(mDFInfo.Fields["ID"]), "ID"));
// tablePanel.Add(4, 5, 0, 1, new DFLabel(mDFInfo.Fields["Supplier_ID"], 4));
// tablePanel.Add(5, 6, 0, 1, mQueryContainer.Add(QueryCreator.DFChoiceBox(mDFInfo.Fields["Supplier_ID"], B3ProcurementInterfaceDataSources.供应商用于屠宰场), "Supplier_ID"));
// _hideSelected = new DFCheckBox { Text = "隐藏已选单据", Checked = true };
// tablePanel.Add(6, 7, 0, 1, _hideSelected);
// base.CreateQuery(vPanel);
//}
//protected override void SetResultFromDFDataRow(StatPay_HurryButcher dmo, DFDataRow row)
//{
//}
//protected override void AddSelectButtons(Control parent)
//{
//}
//protected override void CreateQueryGrid(VLayoutPanel vPanel)
//{
// base.CreateQueryGrid(vPanel);
// var hPanel = new HLayoutPanel();
// vPanel.Add(hPanel, new VLayoutOption(HorizontalAlign.Left));
// var select = new TSButton("选择");
// var cancel = new TSButton("取消");
// hPanel.Add(select);
// hPanel.Add(cancel);
// select.Click += delegate
// {
// if (DmoID == null)
// throw new ApplicationException("结算单号为空");
// var list = queryGrid.GetSelectedItems().Select(row => (long)row["DetailID"]).ToList();
// var bl = BIFactory.Create<IStatPayBL>();
// bl.SetHurryButchers(list, DmoID.Value);
// queryGrid.DataBind();
// };
// cancel.Click += delegate
// {
// if (DmoID == null)
// throw new ApplicationException("结算单号为空");
// var list = queryGrid.GetSelectedItems().Select(row => (long)row["DetailID"]).ToList();
// var bl = BIFactory.Create<IStatPayBL>();
// bl.CancelHurryButchers(list, DmoID.Value);
// queryGrid.DataBind();
// };
//}
//protected override void CreateQueryGridColumns(DFBrowseGrid grid)
//{
// grid.Columns.Add(new DFBrowseGridColumn("ID"));
// grid.Columns.Add(new DFBrowseGridColumn("Date"));
// grid.Columns.Add(new DFBrowseGridColumn("Employee_Name"));
// grid.Columns.Add(new DFBrowseGridColumn("Supplier_Name"));
// grid.Columns.Add(new DFBrowseGridColumn("BillState"));
// grid.Columns.Add(new DFBrowseGridColumn("StatPay_ID"));
// grid.Columns.Add(new DFBrowseGridColumn("LiveVarieties_Name"));
// grid.Columns.Add(new DFBrowseGridColumn("Livestock_Name"));
// grid.Columns.Add(new DFBrowseGridColumn("Number"));
// grid.Columns.Add(new DFBrowseGridColumn("Weight"));
// grid.Columns.Add(new DFBrowseGridColumn("Weigh_ID"));
// grid.Columns.Add(new DFBrowseGridColumn("Remark"));
//}
//protected override DQueryDom GetQueryDom()
//{
// var dom = base.GetQueryDom();
// var main = dom.From.RootSource.Alias;
// var detail = new JoinAlias(typeof(HurryButcher_Detail));
// dom.Columns.Add(DQSelectColumn.Field("ID", main));
// dom.Columns.Add(DQSelectColumn.Field("Date", main));
// dom.Columns.Add(DQSelectColumn.Field("Employee_Name", main));
// dom.Columns.Add(DQSelectColumn.Field("Remark", main));
// dom.Columns.Add(DQSelectColumn.Field("BillState", main));
// dom.Columns.Add(DQSelectColumn.Field("StatPay_ID", detail));
// dom.Columns.Add(DQSelectColumn.Field("Livestock_Name", detail));
// dom.Columns.Add(DQSelectColumn.Field("LiveVarieties_ID", detail));
// dom.Columns.Add(DQSelectColumn.Field("LiveVarieties_Name", detail));
// dom.Columns.Add(DQSelectColumn.Field("Number", detail));
// dom.Columns.Add(DQSelectColumn.Field("Weight", detail));
// dom.Columns.Add(DQSelectColumn.Field("Weigh_ID", detail));
// dom.Columns.Add(DQSelectColumn.Create(DQExpression.Field(detail, "ID"), "DetailID"));
// dom.From.AddJoin(JoinType.Left, new DQDmoSource(detail), DQCondition.EQ(main, "ID", detail, "HurryButcher_ID"));
// using (var context = new TransactionContext())
// {
// var supID = InnerBLUtil.GetDmoPropertyByID<long?>(context.Session, typeof(StatPay), "Supplier_ID", DmoID ?? 0);
// dom.Where.Conditions.Add(DQCondition.EQ("Supplier_ID", supID));
// var weightID = InnerBLUtil.GetDmoPropertyByID<long?>(context.Session, typeof(StatPay), "Weigh_ID", DmoID ?? 0);
// var weightDate = InnerBLUtil.GetDmoPropertyByID<DateTime?>(context.Session, typeof(WeighBill), "WeighTime", weightID ?? 0);
// if (weightDate.HasValue)
// {
// var startDate = weightDate.Value.Date;
// var endDate = weightDate.Value.AddDays(1);
// var beforeWeighCondition = DQCondition.And(DQCondition.IsNull(DQExpression.Field(detail, "Weigh_ID")),
// DQCondition.EQ(detail, "AfterWeigh", false), DQCondition.GreaterThanOrEqual("Date", startDate),
// DQCondition.LessThan("Date", endDate));
// dom.Where.Conditions.Add(DQCondition.Or(DQCondition.EQ(detail, "Weigh_ID", weightID), beforeWeighCondition));
// }
// }
// if (_hideSelected.Checked)
// {
// dom.Where.Conditions.Add(DQCondition.IsNull(DQExpression.Field(detail, "StatPay_ID")));
// }
// dom.Where.Conditions.Add(DQCondition.EQ(main, "BillState", 单据状态.已审核));
// return dom;
//}
protected override void InitForm(System.Web.UI.HtmlControls.HtmlForm form)
long? DmoID
{
get
{
var strW = Request.QueryString["DmoID"];
if (string.IsNullOrEmpty(strW))
return null;
return long.Parse(strW);
}
}
DFCheckBox _hideSelected;
protected override void CreateQuery(VLayoutPanel vPanel)
{
var tablePanel = new TableLayoutPanel(8, 2);
vPanel.Add(tablePanel);
tablePanel.Add(0, 1, 0, 1, new DFLabel(mDFInfo.Fields["ID"], 4));
tablePanel.Add(1, 2, 0, 1, mQueryContainer.Add(new DFTextBox(mDFInfo.Fields["ID"]), "ID"));
tablePanel.Add(4, 5, 0, 1, new DFLabel(mDFInfo.Fields["Supplier_ID"], 4));
tablePanel.Add(5, 6, 0, 1, mQueryContainer.Add(QueryCreator.DFChoiceBox(mDFInfo.Fields["Supplier_ID"], B3ProcurementInterfaceDataSources.供应商用于屠宰场), "Supplier_ID"));
_hideSelected = new DFCheckBox { Text = "隐藏已选单据", Checked = true };
tablePanel.Add(6, 7, 0, 1, _hideSelected);
base.CreateQuery(vPanel);
}
protected override void SetResultFromDFDataRow(StatPay_HurryButcher dmo, DFDataRow row)
{
}
protected override void AddSelectButtons(Control parent)
{
}
protected override void CreateQueryGrid(VLayoutPanel vPanel)
{
base.CreateQueryGrid(vPanel);
var hPanel = new HLayoutPanel();
vPanel.Add(hPanel, new VLayoutOption(HorizontalAlign.Left));
var select = new TSButton("选择");
var cancel = new TSButton("取消");
hPanel.Add(select);
hPanel.Add(cancel);
select.Click += delegate {
if (DmoID == null)
throw new ApplicationException("结算单号为空");
var list = queryGrid.GetSelectedItems().Select(row => (long)row["DetailID"]).ToList();
var bl = BIFactory.Create<IStatPayBL>();
bl.SetHurryButchers(list, DmoID.Value);
queryGrid.DataBind();
};
cancel.Click += delegate {
if (DmoID == null)
throw new ApplicationException("结算单号为空");
var list = queryGrid.GetSelectedItems().Select(row => (long)row["DetailID"]).ToList();
var bl = BIFactory.Create<IStatPayBL>();
bl.CancelHurryButchers(list, DmoID.Value);
queryGrid.DataBind();
};
}
protected override void CreateQueryGridColumns(DFBrowseGrid grid)
{
grid.Columns.Add(new DFBrowseGridColumn("ID"));
grid.Columns.Add(new DFBrowseGridColumn("Date"));
grid.Columns.Add(new DFBrowseGridColumn("Employee_Name"));
grid.Columns.Add(new DFBrowseGridColumn("Supplier_Name"));
grid.Columns.Add(new DFBrowseGridColumn("BillState"));
grid.Columns.Add(new DFBrowseGridColumn("StatPay_ID"));
grid.Columns.Add(new DFBrowseGridColumn("LiveVarieties_Name"));
grid.Columns.Add(new DFBrowseGridColumn("Livestock_Name"));
grid.Columns.Add(new DFBrowseGridColumn("Number"));
grid.Columns.Add(new DFBrowseGridColumn("Weight"));
grid.Columns.Add(new DFBrowseGridColumn("Weigh_ID"));
grid.Columns.Add(new DFBrowseGridColumn("Remark"));
}
protected override DQueryDom GetQueryDom()
{
var dom = base.GetQueryDom();
var main = dom.From.RootSource.Alias;
var detail = new JoinAlias(typeof(HurryButcher_Detail));
dom.Columns.Add(DQSelectColumn.Field("ID", main));
dom.Columns.Add(DQSelectColumn.Field("Date", main));
dom.Columns.Add(DQSelectColumn.Field("Employee_Name", main));
dom.Columns.Add(DQSelectColumn.Field("Remark", main));
dom.Columns.Add(DQSelectColumn.Field("BillState", main));
dom.Columns.Add(DQSelectColumn.Field("StatPay_ID", detail));
dom.Columns.Add(DQSelectColumn.Field("Livestock_Name", detail));
dom.Columns.Add(DQSelectColumn.Field("LiveVarieties_ID", detail));
dom.Columns.Add(DQSelectColumn.Field("LiveVarieties_Name", detail));
dom.Columns.Add(DQSelectColumn.Field("Number", detail));
dom.Columns.Add(DQSelectColumn.Field("Weight", detail));
dom.Columns.Add(DQSelectColumn.Field("Weigh_ID", detail));
dom.Columns.Add(DQSelectColumn.Create(DQExpression.Field(detail, "ID"), "DetailID"));
dom.From.AddJoin(JoinType.Left, new DQDmoSource(detail), DQCondition.EQ(main, "ID", detail, "HurryButcher_ID"));
using (var context = new TransactionContext())
{
var supID = InnerBLUtil.GetDmoPropertyByID<long?>(context.Session, typeof(StatPay), "Supplier_ID", DmoID ?? 0);
dom.Where.Conditions.Add(DQCondition.EQ("Supplier_ID", supID));
var weightID = InnerBLUtil.GetDmoPropertyByID<long?>(context.Session, typeof(StatPay), "WeightBill_ID", DmoID ?? 0);
var weightDate = InnerBLUtil.GetDmoPropertyByID<DateTime?>(context.Session, typeof(WeightBill), "WeighTime", weightID ?? 0);
if (weightDate.HasValue)
{
var startDate = weightDate.Value.Date;
var endDate = weightDate.Value.AddDays(1);
var beforeWeighCondition = DQCondition.And(DQCondition.IsNull(DQExpression.Field(detail, "Weigh_ID")),
DQCondition.EQ(detail, "AfterWeigh", false), DQCondition.GreaterThanOrEqual("Date", startDate),
DQCondition.LessThan("Date", endDate));
dom.Where.Conditions.Add(DQCondition.Or(DQCondition.EQ(detail, "Weigh_ID", weightID), beforeWeighCondition));
}
}
if (_hideSelected.Checked)
{
dom.Where.Conditions.Add(DQCondition.IsNull(DQExpression.Field(detail, "StatPay_ID")));
}
dom.Where.Conditions.Add(DQCondition.EQ(main, "BillState", 单据状态.已审核));
return dom;
}
}
}

+ 115
- 0
B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Reports/HurryButcherAnalyse_/HurryButcherAnalyse.cs View File

@ -0,0 +1,115 @@
using BWP.B3Frameworks;
using BWP.B3Frameworks.Utils;
using BWP.B3ProcurementInterface.Utils;
using BWP.B3SheepButcherManage.BO;
using BWP.Web.Layout;
using BWP.Web.Utils;
using Forks.EnterpriseServices.DataForm;
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.Reports.HurryButcherAnalyse_
{
class HurryButcherAnalyse : DFBrowseGridReportPage<HurryButcher>
{
protected override string Caption
{
get { return "急宰单分析"; }
}
protected override string QueryOptionsTabName
{
get
{
return "显示字段";
}
}
protected override string AccessRoleName
{
get { return "B3ButcherManage.急宰单.访问"; }
}
readonly Dictionary<string, DFInfo> _fileInfo = new Dictionary<string, DFInfo>();
readonly List<string> _sumCol = new List<string>();
protected override void AddQueryControls(VLayoutPanel vPanel)
{
var layout = new LayoutManager("Main", mDFInfo, mQueryContainer);
layout.Add("AccountingUnit_ID", new SimpleLabel("会计单位"), QueryCreator.DFChoiceBox(mDFInfo.Fields["AccountingUnit_ID"], B3FrameworksConsts.DataSources.授权会计单位全部));
layout.Add("Department_ID", new SimpleLabel("部门"), QueryCreator.DFChoiceBox(mDFInfo.Fields["Department_ID"], B3FrameworksConsts.DataSources.授权部门全部));
layout.Add("Employee_ID", new SimpleLabel("经办人"), QueryCreator.DFChoiceBox(mDFInfo.Fields["Employee_ID"], B3FrameworksConsts.DataSources.授权员工全部));
layout.Add("Supplier_ID", new SimpleLabel("供应商"), QueryCreator.DFChoiceBox(mDFInfo.Fields["Supplier_ID"], B3ProcurementInterfaceDataSources.供应商用于屠宰场));
layout.Add("Date", new SimpleLabel("日期"), QueryCreator.TimeRange(mDFInfo.Fields["Date"], mQueryContainer, "MinDate", "MaxDate"));
layout["Date"].NotAutoAddToContainer = true;
var input = QueryCreator.一般单据状态(mDFInfo.Fields["BillState"]);
input.Fill("20", "已审核;");
layout.Add("BillState", new SimpleLabel("单据状态"), input);
var config = new AutoLayoutConfig { Cols = 2 };
config.Add("ID");
config.Add("AccountingUnit_ID");
config.Add("Department_ID");
config.Add("Employee_ID");
config.Add("Supplier_ID");
config.Add("Date");
config.Add("BillState");
layout.Config = config;
vPanel.Add(layout.CreateLayout());
}
ReportDisplayOptionHelper mDisplayHelper = new ReportDisplayOptionHelper();
protected override void AddQueryOptions(VLayoutPanel vPanel)
{
mDisplayHelper.AddOptionItem("单号", "bill", "ID", false);
mDisplayHelper.AddOptionItem("日期", "bill", "Date", false);
mDisplayHelper.AddOptionItem("会计单位", "bill", "AccountingUnit_Name", false);
mDisplayHelper.AddOptionItem("部门", "bill", "Department_Name", false);
mDisplayHelper.AddOptionItem("经办人", "bill", "Employee_Name", false);
mDisplayHelper.AddOptionItem("供应商", "bill", "Supplier_Name", false);
mDisplayHelper.AddOptionItem("摘要", "bill", "Remark", false);
mDisplayHelper.AddOptionItem("是否过磅", "HurryButcher_Detail", "AfterWeigh", false);
mDisplayHelper.AddOptionItem("过磅单号", "HurryButcher_Detail", "Weigh_ID", false);
mDisplayHelper.AddOptionItem("级别", "HurryButcher_Detail", "Livestock_Name", false);
mDisplayHelper.AddOptionItem("头数", "HurryButcher_Detail", "Number", false, true);
mDisplayHelper.AddOptionItem("毛重", "HurryButcher_Detail", "GrossWeight", false, true);
mDisplayHelper.AddOptionItem("重量", "HurryButcher_Detail", "Weight", false, true);
mDisplayHelper.AddOptionItem("备注", "HurryButcher_Detail", "Remark", false);
AddQueryOption("选项", mDisplayHelper.GetAllDisplayNames(), mDisplayHelper.GetDefaultSelelectedDisplayNames());
base.AddQueryOptions(vPanel);
}
protected override DQueryDom GetQueryDom()
{
var dom = base.GetQueryDom();
var bill = dom.From.RootSource.Alias;
mDisplayHelper.AddAlias("bill", JoinAlias.Create("bill"));
var HurryButcher_Detail = new JoinAlias("HurryButcher_Detail", typeof(HurryButcher_Detail));
mDisplayHelper.AddAlias("HurryButcher_Detail", JoinAlias.Create("HurryButcher_Detail"));
dom.From.AddJoin(JoinType.Left, new DQDmoSource(HurryButcher_Detail), DQCondition.EQ(bill, "ID", HurryButcher_Detail, "HurryButcher_ID"));
mDisplayHelper.AddSelectColumns(dom, (name) => OptionIsSelected("选项", name), SumColumnIndexs);
dom.Where.Conditions.Add(DQCondition.EQ(bill, "Domain_ID", DomainContext.Current.ID));
OrganizationUtil.AddOrganizationLimit(dom, typeof(HurryButcher));
return dom;
}
}
}

+ 54
- 0
B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Reports/HurryButcherAnalyse_/HurryButcherAnalyse.xml View File

@ -0,0 +1,54 @@
<?xml version="1.0" encoding="utf-8" ?>
<Select xmlns="urn:XDQuery">
<Columns>
</Columns>
<From>
<DmoClass class="BWP.B3SheepButcherManage.BO.HurryButcher, B3SheepButcherManage" alias="bill"/>
</From>
<Where>
<And>
<EQ>
<Field name="ID" alias="bill"/>
<QBE paramName="ID"/>
</EQ>
<EQ>
<Field name="AccountingUnit_ID" alias="bill"/>
<QBE paramName="AccountingUnit_ID"/>
</EQ>
<EQ>
<Field name="Department_ID" alias="bill"/>
<QBE paramName="Department_ID"/>
</EQ>
<EQ>
<Field name="Employee_ID" alias="bill"/>
<QBE paramName="Employee_ID"/>
</EQ>
<EQ>
<Field name="Employee_ID" alias="bill"/>
<QBE paramName="Employee_ID"/>
</EQ>
<EQ>
<Field name="BillState" alias="bill"/>
<QBE paramName="BillState"/>
</EQ>
<EQ>
<Field name="Supplier_ID" alias="bill"/>
<QBE paramName="Supplier_ID"/>
</EQ>
<GreaterThanOrEqual>
<Field name="Date" alias="bill"/>
<QBE paramName="MinDate" />
</GreaterThanOrEqual>
<LessThanOrEqual>
<Field name="Date" alias="bill"/>
<QBE paramName="MaxDate"/>
</LessThanOrEqual>
</And>
</Where>
</Select>

+ 2
- 2
B3SheepButcherManage/BL/Bill/StatPayBL/StatPayBL.cs View File

@ -443,12 +443,12 @@ namespace BWP.B3SheepButcherManage.BL
public void SetHurryButchers(List<long> detailList, long statPayID)
{
//SetDetails<HurryButcher_Detail>(detailList, statPayID);
SetDetails<HurryButcher_Detail>(detailList, statPayID);
}
public void CancelHurryButchers(List<long> detailList, long statPayID)
{
//CancelDetails<HurryButcher_Detail>(detailList, statPayID);
CancelDetails<HurryButcher_Detail>(detailList, statPayID);
}
public void CancelAllHurryButchers(long statPayID)


Write Preview
Loading…
Cancel
Save