From 1f15b2177d424764e37698027407f5fed82aff89 Mon Sep 17 00:00:00 2001 From: duanluohua <747400316@qq.com> Date: Tue, 30 Jan 2018 14:57:03 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=E9=9C=80=E6=B1=82=E5=8D=95No.138363?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- B3_DongFangWanQi.Web/B3_DongFangWanQi.Web.csproj | 4 ++-- .../Tools/SaleOrderUpdateEdit.cs | 10 +++++----- .../Tools/SaleOrderUpdateList.cs | 16 ++++++++-------- B3_DongFangWanQi/B3_DongFangWanQi.csproj | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/B3_DongFangWanQi.Web/B3_DongFangWanQi.Web.csproj b/B3_DongFangWanQi.Web/B3_DongFangWanQi.Web.csproj index 5520eff..8f08714 100644 --- a/B3_DongFangWanQi.Web/B3_DongFangWanQi.Web.csproj +++ b/B3_DongFangWanQi.Web/B3_DongFangWanQi.Web.csproj @@ -37,11 +37,11 @@ False ..\..\..\tsref\Debug\B3ButcherManage.dll - + False False ..\..\..\tsref\Debug\B3CowButcherManage.Web.dll - + False False False diff --git a/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateEdit.cs b/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateEdit.cs index 66075fe..1261969 100644 --- a/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateEdit.cs +++ b/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateEdit.cs @@ -288,7 +288,7 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools { var gbl = BIFactory.Create(); var cannotUpdateID = new List(); var updateIDs = new List(); - long GoodsProperty_ID = 0; + //long GoodsProperty_ID = 0; foreach (var orderDetails in groupByOrderID) { var order = bl.Load(orderDetails.Key); @@ -312,7 +312,7 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools { detail.Price = cDetail.Price; changed = true; } - GoodsProperty_ID = (long)detail.GoodsProperty_ID; + //GoodsProperty_ID = (long)detail.GoodsProperty_ID; } if (changed) { @@ -325,9 +325,9 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools { updateIDs.Add(order.ID); } } - var GoodsProperty = gbl.Load(GoodsProperty_ID); - GoodsProperty.AdjustNum += 1; - gbl.Update(GoodsProperty); + //var GoodsProperty = gbl.Load(GoodsProperty_ID); + //GoodsProperty.AdjustNum += 1; + //gbl.Update(GoodsProperty); string msg; if (updateIDs.Count > 0) msg = string.Format("保存成功\n已更新销售订单No.{0}\n", string.Join(",", updateIDs)); diff --git a/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateList.cs b/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateList.cs index 3ee36ba..e514dca 100644 --- a/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateList.cs +++ b/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateList.cs @@ -164,7 +164,7 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools { _grid.Columns.Add(new DFBrowseGridColumn("可用库存")); _grid.Columns.Add(new DFBrowseGridColumn("测算数量")); _grid.Columns.Add(new DFBrowseGridColumn("可用与预算合计")); - _grid.Columns.Add(new DFBrowseGridColumn("AdjustNum")); + //_grid.Columns.Add(new DFBrowseGridColumn("AdjustNum")); _grid.Columns.Add(new DFBrowseGridColumn("预计剩余数量")); _grid.Columns.Add(new DFBrowseGridColumn("预计剩余头数")); _grid.OnDetailDataBound += (htmlRow, dataRow, o) => { @@ -173,8 +173,8 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools { return; var diff = (decimal?)row["预计剩余数量"]; + AddLinkBt(o, row, 5, diff, htmlRow); AddLinkBt(o, row, 6, diff, htmlRow); - AddLinkBt(o, row, 7, diff, htmlRow); }; tPanel.Controls.Add(_grid); @@ -241,7 +241,7 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools { AvailableStorageUtil.RegisgterAvaliableStorageUnionTable(dom, context); //汇总可用库存 RegisgterAvaliableStorageSumTable(dom); - dom.RegisterQueryTable(typeof(OrderTmp), new[] { "GoodsProperty_ID", "Number", "SecondNumber", "UnitNum", "AdjustNum" }, GetOrderDQueryDom()); + dom.RegisterQueryTable(typeof(OrderTmp), new[] { "GoodsProperty_ID", "Number", "SecondNumber", "UnitNum"}, GetOrderDQueryDom()); dom.RegisterQueryTable(typeof(OutputTmp), new[] { "GoodsProperty_ID", "Number", "MainNumber","Date" }, GetOutputDQueryDom()); dom.RegisterQueryTable(typeof(OutputConfigTmp), new[] { "GoodsProperty_ID", "Number" }, GetOutputConfigureDom()); dom.From.AddJoin(JoinType.Left, new DQDmoSource(goodsProperty), DQCondition.EQ(bill, "GoodsProperty_ID", goodsProperty, "ID")); @@ -251,7 +251,7 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools { dom.Columns.Add(DQSelectColumn.Field("GoodsProperty_ID", bill)); dom.Columns.Add(DQSelectColumn.Field("GoodsProperty_Name", bill)); dom.Columns.Add(DQSelectColumn.Field("UnitNum", bill)); - dom.Columns.Add(DQSelectColumn.Field("AdjustNum", bill)); + //dom.Columns.Add(DQSelectColumn.Field("AdjustNum", bill)); dom.Columns.Add(DQSelectColumn.Create(DQExpression.Field(storeDetail, "Number"), "可用库存")); dom.Columns.Add(DQSelectColumn.Create(DQExpression.Field(output, "Number"), "测算数量")); @@ -331,8 +331,8 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools { [Join("GoodsProperty_ID", "ID")] public string GoodsProperty_Name { get; set; } - [LogicName("调整次数")] - public int AdjustNum { get; set; } + //[LogicName("调整次数")] + //public int AdjustNum { get; set; } } @@ -388,10 +388,10 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools { dom.Columns.Add(DQSelectColumn.Create(DQExpression.Sum(DQExpression.Field(detail, "Number")), "主数量")); dom.Columns.Add(DQSelectColumn.Create(DQExpression.Sum(DQExpression.Field(detail, "SecondNumber")), "主数量")); dom.Columns.Add(DQSelectColumn.Create(DQExpression.Sum(DQExpression.Field(detail, "UnitNum")), "主数量")); - dom.Columns.Add(DQSelectColumn.Field("AdjustNum", goodsProperty)); + //dom.Columns.Add(DQSelectColumn.Field("AdjustNum", goodsProperty)); dom.GroupBy.Expressions.Add(DQExpression.Field(goodsProperty, "ID")); - dom.GroupBy.Expressions.Add(DQExpression.Field(goodsProperty, "AdjustNum")); + //dom.GroupBy.Expressions.Add(DQExpression.Field(goodsProperty, "AdjustNum")); dom.Where.Conditions.Add(DQCondition.EQ("BillState", 单据状态.未审核)); dom.Where.Conditions.Add(DQCondition.EQ(bill, "Domain_ID", DomainContext.Current.ID)); diff --git a/B3_DongFangWanQi/B3_DongFangWanQi.csproj b/B3_DongFangWanQi/B3_DongFangWanQi.csproj index ba6b933..4bbe6c9 100644 --- a/B3_DongFangWanQi/B3_DongFangWanQi.csproj +++ b/B3_DongFangWanQi/B3_DongFangWanQi.csproj @@ -51,7 +51,7 @@ False ..\..\..\tsref\Debug\B3SaleInterface.dll - + False False False