diff --git a/B3SubstituteKill.Web/Pages/B3SubstituteKill/Bills/SubKillButcherOrder_/SubKillButcherOrderEdit.cs b/B3SubstituteKill.Web/Pages/B3SubstituteKill/Bills/SubKillButcherOrder_/SubKillButcherOrderEdit.cs index 3dbb397..178bb79 100644 --- a/B3SubstituteKill.Web/Pages/B3SubstituteKill/Bills/SubKillButcherOrder_/SubKillButcherOrderEdit.cs +++ b/B3SubstituteKill.Web/Pages/B3SubstituteKill/Bills/SubKillButcherOrder_/SubKillButcherOrderEdit.cs @@ -142,6 +142,11 @@ __DFContainer.setValue('PriceBill_ID',''); { e.Control.Style["width"] = "120px"; }; + + _detailGrid.Columns.EAdd(new DFEditGridColumn("AllMixedNumber")).InitEditControl += (sender, e) => + { + e.Control.Style["width"] = "120px"; + }; _detailGrid.Columns.EAdd(new DFEditGridColumn("Weight")).InitEditControl += (sender, e) => { e.Control.Style["width"] = "120px"; diff --git a/B3SubstituteKill.Web/Pages/B3SubstituteKill/Reports/SubKillButcherOrderAnalyse_/SubKillButcherOrderAnalyse.cs b/B3SubstituteKill.Web/Pages/B3SubstituteKill/Reports/SubKillButcherOrderAnalyse_/SubKillButcherOrderAnalyse.cs index b92d35f..e4d37a4 100644 --- a/B3SubstituteKill.Web/Pages/B3SubstituteKill/Reports/SubKillButcherOrderAnalyse_/SubKillButcherOrderAnalyse.cs +++ b/B3SubstituteKill.Web/Pages/B3SubstituteKill/Reports/SubKillButcherOrderAnalyse_/SubKillButcherOrderAnalyse.cs @@ -89,6 +89,7 @@ namespace BWP.Web.Pages.B3SubstituteKill.Reports.SubKillButcherOrderAnalyse_ mDisplayHelper.AddOptionItem("生产线", "detail", "SubKillProductLine_Name", false); mDisplayHelper.AddOptionItem("代宰标识", "detail", "SubKillFlag_Detail_Name", false); mDisplayHelper.AddOptionItem("头数", "detail", "Number", false, true); + mDisplayHelper.AddOptionItem("全杂头数", "detail", "AllMixedNumber", false, true); mDisplayHelper.AddOptionItem("重量", "detail", "Weight", false, true); mDisplayHelper.AddOptionItem("圈舍", "detail", "LiveColonyHouse_Name", false); diff --git a/B3SubstituteKill/BO/Bills/SubKillButcherOrder/SubKillButcherOrder_Detail.cs b/B3SubstituteKill/BO/Bills/SubKillButcherOrder/SubKillButcherOrder_Detail.cs index c0e5c24..7803a65 100644 --- a/B3SubstituteKill/BO/Bills/SubKillButcherOrder/SubKillButcherOrder_Detail.cs +++ b/B3SubstituteKill/BO/Bills/SubKillButcherOrder/SubKillButcherOrder_Detail.cs @@ -25,6 +25,9 @@ namespace BWP.B3SubstituteKill.BO [LogicName("头数")] public int? Number { get; set; } + [LogicName("全杂头数")] + public int? AllMixedNumber { get; set; } + [LogicName("重量")] public Money? Weight { get; set; }