diff --git a/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Overlays/StatPayEdit_Ext.cs b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Overlays/StatPayEdit_Ext.cs index db2f806..467c918 100644 --- a/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Overlays/StatPayEdit_Ext.cs +++ b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Overlays/StatPayEdit_Ext.cs @@ -32,7 +32,7 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.Overlays editor.CanDeleteFunc = detail => false; editor.IsEditableFunc = (field, detail) => { - return CanSave && field.Name == "ExtMoney"; + return CanSave && field.Name == "ExtMoney2"; }; _farmerGrid = panel.EAdd(new DFEditGrid(editor) { Width = Unit.Percentage(100), ShowLineNo = true }); @@ -44,6 +44,8 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.Overlays _farmerGrid.Columns.Add(new DFEditGridColumn("Number")); _farmerGrid.Columns.Add(new DFEditGridColumn("ExeWeight")); _farmerGrid.Columns.Add(new DFEditGridColumn("ExtMoney")); + _farmerGrid.Columns.Add(new DFEditGridColumn("ExtMoney2")); + _farmerGrid.Columns.Add(new DFEditGridColumn("ExtMoney3")); var section4 = mPageLayoutManager.AddSection("detailColumns4", "养殖户信息"); section4.ApplyLayout(_farmerGrid, mPageLayoutManager, DFInfo.Get(typeof(Weigh_FarmerDetail))); diff --git a/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/StatPayAnalyse.cs b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/StatPayAnalyse.cs index aa31388..7cad89e 100644 --- a/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/StatPayAnalyse.cs +++ b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/StatPayAnalyse.cs @@ -138,6 +138,8 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.Reports mDisplayHelper.AddOptionItem("棚前头数", "_detail", "Number", false, true); mDisplayHelper.AddOptionItem("棚前重量", "_detail", "ExeWeight", false, true); mDisplayHelper.AddOptionItem("棚前金额", "_detail", "ExtMoney", false, true); + mDisplayHelper.AddOptionItem("异常调整", "_detail", "ExtMoney2", false, true); + mDisplayHelper.AddOptionItem("调整后金额", () => DQExpression.Snippet("ISNULL([_detail].[ExtMoney],0)+ISNULL([_detail].[ExtMoney2],0)").ECastType(), false, true); mDisplayHelper.AddOptionItem("付款对象", "_bill", "PayTarget", false); AddQueryOption("选项", mDisplayHelper.GetAllDisplayNames(), mDisplayHelper.GetDefaultSelelectedDisplayNames()); diff --git a/B3QingDaoWanFu/TypeIOCs/StatPayBLTypeIoc.cs b/B3QingDaoWanFu/TypeIOCs/StatPayBLTypeIoc.cs index 3e1c8a0..2cfa0ab 100644 --- a/B3QingDaoWanFu/TypeIOCs/StatPayBLTypeIoc.cs +++ b/B3QingDaoWanFu/TypeIOCs/StatPayBLTypeIoc.cs @@ -42,7 +42,7 @@ namespace BWP.B3QingDaoWanFu.TypeIOCs { detail.ExeWeight = dmo.RealWeight * detail.Number / dmo.RealNumber; var money = detail.Money; - if (dmo.PurchaseType_Name == "业务" && dmo.PayTarget == 付款对象.养殖户) + if (dmo.PurchaseType_Name == "业务" && dmo.PayTarget == 付款对象.供应商) { var extMoney = dmo.JingJianFee / dmo.RealNumber * detail.Number; if (extMoney.HasValue) @@ -86,7 +86,7 @@ namespace BWP.B3QingDaoWanFu.TypeIOCs if (dmo.PurchaseType_Name == "业务") { if (dmo.FarmerDetails.Any()) - dmo.ShackMoney = dmo.FarmerDetails.Sum(x => x.ExtMoney ?? 0); + dmo.ShackMoney = dmo.FarmerDetails.Sum(x => x.ExtMoney3 ?? 0); dmo.ActualMoney = (dmo.ShackMoney.EToDecimal() ?? 0); Money? we = null; if (dmo.ShackWeight != 0) @@ -114,7 +114,7 @@ namespace BWP.B3QingDaoWanFu.TypeIOCs { detail.ExeWeight = dmo.RealWeight * detail.Number / dmo.RealNumber; var money = detail.Money; - if (dmo.PurchaseType_Name == "业务" && dmo.PayTarget == 付款对象.养殖户) + if (dmo.PurchaseType_Name == "业务" && dmo.PayTarget == 付款对象.供应商) { var extMoney = dmo.JingJianFee / dmo.RealNumber * detail.Number; if (extMoney.HasValue) diff --git a/B3QingDaoWanFu/TypeIOCs/WeightBillTypeIoc.cs b/B3QingDaoWanFu/TypeIOCs/WeightBillTypeIoc.cs index e5ce36c..adf9528 100644 --- a/B3QingDaoWanFu/TypeIOCs/WeightBillTypeIoc.cs +++ b/B3QingDaoWanFu/TypeIOCs/WeightBillTypeIoc.cs @@ -1,5 +1,6 @@ using BWP.B3ButcherManage.BL; using BWP.B3ButcherManage.BO; +using BWP.B3ButcherManage.NamedValueTemplate; using BWP.B3Frameworks; using Forks.EnterpriseServices.BusinessInterfaces; using System; @@ -18,4 +19,13 @@ namespace BWP.B3QingDaoWanFu.TypeIOCs throw new Exception("付款对象不能为空"); } } + + [TypeIOC(typeof(WeightBillBL), typeof(WeightBillBL.BaseBLIOCs.BeforeSave))] + public class WeightBillBeforeSave : WeightBillBL.BaseBLIOCs.BeforeSave + { + public void Invoke(IDmoContext context, WeighBill dmo) + { + dmo.PayTarget = 付款对象.供应商; + } + } }