diff --git a/B3ClientService.Web/Pages/B3ClientService/Reports/CarcassLossAnalyse_/CarcassLossAnalyse.cs b/B3ClientService.Web/Pages/B3ClientService/Reports/CarcassLossAnalyse_/CarcassLossAnalyse.cs index 7d8a3aa..dec55ea 100644 --- a/B3ClientService.Web/Pages/B3ClientService/Reports/CarcassLossAnalyse_/CarcassLossAnalyse.cs +++ b/B3ClientService.Web/Pages/B3ClientService/Reports/CarcassLossAnalyse_/CarcassLossAnalyse.cs @@ -88,7 +88,7 @@ namespace BWP.Web.Pages.B3ClientService.Reports.CarcassLossAnalyse_ var dtdj = new JoinAlias(typeof(GradeAndWeight_Detail)); var btrk = new JoinAlias(typeof(TrunksIousOutInStoreRecord)); var query = new DQueryDom(dtdj); - query.From.AddJoin(JoinType.Left, new DQDmoSource(btrk), DQCondition.EQ(dtdj, "BarCode", btrk, "BarCode")); + query.From.AddJoin(JoinType.Left, new DQDmoSource(btrk), DQCondition.EQ(dtdj, "ID", btrk, "UpID")); query.Columns.Add(DQSelectColumn.Field("BarCode", "条码")); query.Columns.Add(DQSelectColumn.Field("Livestock_Name", "胴体级别")); query.Columns.Add(DQSelectColumn.Create(DQExpression.Value(1), "头数")); @@ -96,8 +96,8 @@ namespace BWP.Web.Pages.B3ClientService.Reports.CarcassLossAnalyse_ query.Columns.Add(DQSelectColumn.Field("Goods_Name", btrk, "存货名称")); query.Columns.Add(DQSelectColumn.Create(DQExpression.Field(btrk, "Weight"), "入库重量")); query.Columns.Add(DQSelectColumn.Create(DQExpression.Subtract(DQExpression.Field(dtdj, "Weight"), DQExpression.IfNull(DQExpression.Field(btrk, "Weight"), DQExpression.Value(0))), "损耗")); - if (!string.IsNullOrEmpty(batchSelect.DisplayValue)) - query.Where.Conditions.Add(DQCondition.EQ(btrk, "ProductBatch", batchSelect.DisplayValue)); + if (!string.IsNullOrEmpty(batchSelect.Value)) + query.Where.Conditions.Add(DQCondition.EQ(btrk, "ProductBatch_ID", long.Parse(batchSelect.Value))); var args = new LoadArguments(query); args.SumColumns.Add(2); args.SumColumns.Add(3); diff --git a/B3ClientService.Web/Pages/B3ClientService/Reports/CarcassStoreAnalyse_/CarcassStoreAnalyse.cs b/B3ClientService.Web/Pages/B3ClientService/Reports/CarcassStoreAnalyse_/CarcassStoreAnalyse.cs index e8763e1..770479f 100644 --- a/B3ClientService.Web/Pages/B3ClientService/Reports/CarcassStoreAnalyse_/CarcassStoreAnalyse.cs +++ b/B3ClientService.Web/Pages/B3ClientService/Reports/CarcassStoreAnalyse_/CarcassStoreAnalyse.cs @@ -31,7 +31,15 @@ namespace BWP.Web.Pages.B3ClientService.Reports.CarcassStoreAnalyse_ base.OnInit(e); } - string SelectBatch { get { return Request.QueryString["BatchName"]; } } + long? SelectBatch + { + get + { + if (string.IsNullOrEmpty(Request.QueryString["BatchID"])) + return null; + return long.Parse(Request.QueryString["BatchID"]); + } + } DFBrowseGrid mBrowseGrid; protected override void InitForm(HtmlForm form) @@ -55,15 +63,15 @@ namespace BWP.Web.Pages.B3ClientService.Reports.CarcassStoreAnalyse_ { var hp = queryPanel.EAdd(new Panel()); hp.Style.Add("float", "right"); - var batchNames = GetBatchNames(); + var batchNames = GetBatchNameIDs(); var url = Request.Url.ToString(); foreach (var item in batchNames) { - var hl = hp.EAdd(new HyperLink() { Text = item }); + var hl = hp.EAdd(new HyperLink() { Text = item.Item1 }); hl.Style.Add("margin-right", "10px"); hl.Style.Add("font-size", "15px"); - hl.NavigateUrl = AspUtil.UpdateUrlParam(url, "BatchName", HttpUtility.UrlEncode(item)); - if (item == SelectBatch) + hl.NavigateUrl = AspUtil.UpdateUrlParam(url, "BatchID", item.Item2.ToString()); + if (SelectBatch.HasValue && item.Item2 == SelectBatch) { hl.Style.Add("background-color", "#3CC24C"); hl.Style.Add("color", "#FFFFFF"); @@ -72,29 +80,28 @@ namespace BWP.Web.Pages.B3ClientService.Reports.CarcassStoreAnalyse_ var all = hp.EAdd(new HyperLink() { Text = "全部" }); all.Style.Add("margin-right", "10px"); all.Style.Add("font-size", "15px"); - all.NavigateUrl = AspUtil.RemoveUrlParam(url, "BatchName"); - if (string.IsNullOrEmpty(SelectBatch)) + all.NavigateUrl = AspUtil.RemoveUrlParam(url, "BatchID"); + if (SelectBatch == null) { all.Style.Add("background-color", "#3CC24C"); all.Style.Add("color", "#FFFFFF"); } } - List GetBatchNames() + List> GetBatchNameIDs() { -#if DEBUG - return new List { "20170809", "20170810", "20170811", "20170812" }; -#endif var btrk = new JoinAlias(typeof(TrunksIousOutInStoreRecord)); var btly = new JoinAlias(typeof(MaterialRequisitionRecord)); var query = new DQueryDom(btrk); - query.From.AddJoin(JoinType.Left, new DQDmoSource(btly), DQCondition.EQ(btrk, "BarCode", btly, "BarCode")); + query.From.AddJoin(JoinType.Left, new DQDmoSource(btly), DQCondition.EQ(btrk, "ID", btly, "UpID")); query.Columns.Add(DQSelectColumn.Field("ProductBatch")); + query.Columns.Add(DQSelectColumn.Field("ProductBatch_ID")); query.GroupBy.Expressions.Add(DQExpression.Field("ProductBatch")); - query.Where.Conditions.Add(DQCondition.IsNull(DQExpression.Field(btly, "BarCode"))); - query.Where.Conditions.Add(DQCondition.IsNotNull(DQExpression.Field("ProductBatch"))); - query.OrderBy.Expressions.Add(DQOrderByExpression.Create("ProductBatch")); - return query.EExecuteList(); + query.GroupBy.Expressions.Add(DQExpression.Field("ProductBatch_ID")); + query.Where.Conditions.Add(DQCondition.IsNull(DQExpression.Field(btly, "ID"))); + query.Where.Conditions.Add(DQCondition.IsNotNull(DQExpression.Field("ProductBatch_ID"))); + query.OrderBy.Expressions.Add(DQOrderByExpression.Create("ProductBatch_ID")); + return query.EExecuteList(); } private TitlePanel CreateResultTab() @@ -110,7 +117,7 @@ namespace BWP.Web.Pages.B3ClientService.Reports.CarcassStoreAnalyse_ var btrk = new JoinAlias(typeof(TrunksIousOutInStoreRecord)); var btly = new JoinAlias(typeof(MaterialRequisitionRecord)); var query = new DQueryDom(btrk); - query.From.AddJoin(JoinType.Left, new DQDmoSource(btly), DQCondition.EQ(btrk, "BarCode", btly, "BarCode")); + query.From.AddJoin(JoinType.Left, new DQDmoSource(btly), DQCondition.EQ(btrk, "ID", btly, "UpID")); query.Columns.Add(DQSelectColumn.Field("ProductBatch", "生产批次")); query.Columns.Add(DQSelectColumn.Field("BarCode", "条码")); query.Columns.Add(DQSelectColumn.Field("Goods_Name", "存货名称")); @@ -119,9 +126,9 @@ namespace BWP.Web.Pages.B3ClientService.Reports.CarcassStoreAnalyse_ //query.GroupBy.Expressions.Add(DQExpression.Field("ProductBatch")); //query.GroupBy.Expressions.Add(DQExpression.Field("BarCode")); //query.GroupBy.Expressions.Add(DQExpression.Field("Goods_Name")); - query.Where.Conditions.Add(DQCondition.IsNull(DQExpression.Field(btly, "BarCode"))); - if (!string.IsNullOrEmpty(SelectBatch)) - query.Where.Conditions.Add(DQCondition.EQ("ProductBatch", SelectBatch)); + query.Where.Conditions.Add(DQCondition.IsNull(DQExpression.Field(btly, "ID"))); + if (SelectBatch.HasValue) + query.Where.Conditions.Add(DQCondition.EQ("ProductBatch_ID", SelectBatch)); var args = new LoadArguments(query); args.SumColumns.Add(3); args.SumColumns.Add(4); diff --git a/B3ClientService.Web/Pages/B3ClientService/Reports/CarcassTrendAnalyse_/CarcassTrendAnalyse.cs b/B3ClientService.Web/Pages/B3ClientService/Reports/CarcassTrendAnalyse_/CarcassTrendAnalyse.cs index 62f2f9e..ff5afc0 100644 --- a/B3ClientService.Web/Pages/B3ClientService/Reports/CarcassTrendAnalyse_/CarcassTrendAnalyse.cs +++ b/B3ClientService.Web/Pages/B3ClientService/Reports/CarcassTrendAnalyse_/CarcassTrendAnalyse.cs @@ -128,7 +128,7 @@ namespace BWP.Web.Pages.B3ClientService.Reports.CarcassTrendAnalyse_ var btrk = new JoinAlias(typeof(TrunksIousOutInStoreRecord)); var query = new DQueryDom(btly); var dateExp = DQExpression.Snippet("CAST([_linyong].[CreateTime] as date)"); - query.From.AddJoin(JoinType.Left, new DQDmoSource(btrk), DQCondition.EQ(btrk, "BarCode", btly, "BarCode")); + query.From.AddJoin(JoinType.Left, new DQDmoSource(btrk), DQCondition.EQ(btrk, "ID", btly, "UpID")); query.Columns.Add(DQSelectColumn.Create(DQExpression.Value("分割领用"), "OutType")); query.Columns.Add(DQSelectColumn.Create(dateExp, "Date")); query.Columns.Add(DQSelectColumn.Field("Weight", btrk, "InStoreWeight")); diff --git a/B3ClientService.Web/Utils/B3ClientServiceChoiceBoxDataProvider.cs b/B3ClientService.Web/Utils/B3ClientServiceChoiceBoxDataProvider.cs index 155636c..69212bb 100644 --- a/B3ClientService.Web/Utils/B3ClientServiceChoiceBoxDataProvider.cs +++ b/B3ClientService.Web/Utils/B3ClientServiceChoiceBoxDataProvider.cs @@ -19,13 +19,14 @@ namespace BWP.Web.Utils { var dom = new DQueryDom(new JoinAlias(typeof(ProductBatch))); dom.Columns.Add(DQSelectColumn.Field("Name")); + dom.Columns.Add(DQSelectColumn.Field("ID")); if (!string.IsNullOrWhiteSpace(argu.InputArgument)) { dom.Where.Conditions.Add(DQCondition.Like("Name", argu.InputArgument)); } dom.OrderBy.Expressions.Add(DQOrderByExpression.Create("Date", true)); - return dom.EExecuteList().Select(x => new TSingSoft.WebControls2.WordPair(x)); + return dom.EExecuteList().Select(x => new TSingSoft.WebControls2.WordPair(x.Item1, x.Item2.ToString())); }); } }