diff --git a/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateEdit.cs b/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateEdit.cs index 1261969..46046ca 100644 --- a/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateEdit.cs +++ b/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateEdit.cs @@ -28,6 +28,7 @@ using TSingSoft.WebPluginFramework; using TSingSoft.WebPluginFramework.Controls; using TSingSoft.WebPluginFramework.Pages; using BWP.B3UnitedInfos.BL; +using B3_DongFangWanQi.BL; namespace BWP.Web.Pages.B3_DongFangWanQi.Tools { class SaleOrderUpdateEdit : AppBasePage { @@ -286,9 +287,10 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools { var bl = BIFactory.Create(); var gbl = BIFactory.Create(); + var soa = 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 +314,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) { @@ -320,15 +322,22 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools { cannotUpdateID.Add(order.ID); continue; } - bl.Update(order); updateIDs.Add(order.ID); } } - //var GoodsProperty = gbl.Load(GoodsProperty_ID); - //GoodsProperty.AdjustNum += 1; - //gbl.Update(GoodsProperty); - string msg; + var AdjustNumber = GetQuery(GoodsProperty_ID); + if (AdjustNumber != null) + { + AdjustNumber.AdjustNumber += 1; + soa.Update(AdjustNumber); + } + else + { + AdjustNumber = new SaleOrderAdjustNumber() { GoodsProperty_ID = GoodsProperty_ID, AdjustNumber = 1}; + soa.Insert(AdjustNumber); + } + string msg; if (updateIDs.Count > 0) msg = string.Format("保存成功\n已更新销售订单No.{0}\n", string.Join(",", updateIDs)); else { @@ -340,6 +349,14 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools { BindGrid(); } + static SaleOrderAdjustNumber GetQuery(long goodsPropertyId) + { + var dom = new DmoQuery(typeof(SaleOrderAdjustNumber)); + dom.Where.Conditions.Add(DQCondition.EQ("GoodsProperty_ID", goodsPropertyId)); + var r = dom.EExecuteScalar(); + return r; + } + protected override void OnLoad(EventArgs e) { base.OnLoad(e); if (!IsPostBack) { diff --git a/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateList.cs b/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateList.cs index e514dca..4785618 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("AdjustNumber")); _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"}, GetOrderDQueryDom()); + dom.RegisterQueryTable(typeof(OrderTmp), new[] { "GoodsProperty_ID", "Number", "SecondNumber", "UnitNum", "AdjustNumber" }, 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")); @@ -330,13 +330,13 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools { [ReferenceTo(typeof(GoodsProperty), "Name")] [Join("GoodsProperty_ID", "ID")] public string GoodsProperty_Name { get; set; } + + [LogicName("调整次数")] + public int AdjustNumber { get; set; } - //[LogicName("调整次数")] - //public int AdjustNum { get; set; } - - } + } - class StoreDetailTmp { + class StoreDetailTmp { public long GoodsProperty_ID { get; set; } [LogicName("主数量")] @@ -372,12 +372,14 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools { var goodsProperty = new JoinAlias("_gp", typeof(GoodsProperty)); var goods = new JoinAlias("_g", typeof(SaleGoods)); var customer = new JoinAlias("_c", typeof(Customer)); + var adjustnumber = new JoinAlias("_o", typeof(SaleOrderAdjustNumber)); dom.From.AddJoin(JoinType.Inner, new DQDmoSource(detail), - DQCondition.EQ(bill, "ID", detail, "Order_ID")); + DQCondition.EQ(bill, "ID", detail, "Order_ID")); dom.From.AddJoin(JoinType.Left, new DQDmoSource(goods), DQCondition.EQ(detail, "SaleGoods_ID", goods, "ID")); dom.From.AddJoin(JoinType.Left, new DQDmoSource(goodsProperty), DQCondition.EQ(goodsProperty, "ID", goods, "GoodsProperty_ID")); dom.From.AddJoin(JoinType.Left, new DQDmoSource(goodsPropertyCatalog), DQCondition.EQ(goodsProperty, "GoodsPropertyCatalog_ID", goodsPropertyCatalog, "ID")); dom.From.AddJoin(JoinType.Left, new DQDmoSource(customer), DQCondition.EQ(bill, "Customer_ID", customer, "ID")); + dom.From.AddJoin(JoinType.Left, new DQDmoSource(adjustnumber), DQCondition.EQ(adjustnumber, "GoodsProperty_ID", goodsProperty, "ID")); dom.From.AddJoin(JoinType.Left, new DQDmoSource(flowdetail), DQCondition.EQ(bill, "DepartmentWorkFlow_Detail_ID", flowdetail, "ID")); if (!_liuchengfenlei.IsEmpty) { @@ -388,10 +390,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("AdjustNumber", adjustnumber)); dom.GroupBy.Expressions.Add(DQExpression.Field(goodsProperty, "ID")); - //dom.GroupBy.Expressions.Add(DQExpression.Field(goodsProperty, "AdjustNum")); + dom.GroupBy.Expressions.Add(DQExpression.Field(adjustnumber, "AdjustNumber")); 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 4bbe6c9..e58284a 100644 --- a/B3_DongFangWanQi/B3_DongFangWanQi.csproj +++ b/B3_DongFangWanQi/B3_DongFangWanQi.csproj @@ -51,7 +51,8 @@ False ..\..\..\tsref\Debug\B3SaleInterface.dll - False + False + False False @@ -105,12 +106,14 @@ + + diff --git a/B3_DongFangWanQi/BL/SaleOrderAdjustNumberBL.cs b/B3_DongFangWanQi/BL/SaleOrderAdjustNumberBL.cs new file mode 100644 index 0000000..eb317ed --- /dev/null +++ b/B3_DongFangWanQi/BL/SaleOrderAdjustNumberBL.cs @@ -0,0 +1,21 @@ +using B3_DongFangWanQi.BO; +using BWP.B3Frameworks.BL; +using Forks.EnterpriseServices; +using Forks.EnterpriseServices.BusinessInterfaces; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace B3_DongFangWanQi.BL +{ + [BusinessInterface(typeof(SaleOrderAdjustNumberBL))] + [LogicName("调整次数")] + public interface ISaleOrderAdjustNumberBL: IBaseBL + { + + } + public class SaleOrderAdjustNumberBL:BaseBL,ISaleOrderAdjustNumberBL + { + } +} diff --git a/B3_DongFangWanQi/BO/SaleOrderAdjustNumber.cs b/B3_DongFangWanQi/BO/SaleOrderAdjustNumber.cs new file mode 100644 index 0000000..3aa1a8b --- /dev/null +++ b/B3_DongFangWanQi/BO/SaleOrderAdjustNumber.cs @@ -0,0 +1,22 @@ +using BWP.B3Frameworks.BO; +using Forks.EnterpriseServices; +using Forks.EnterpriseServices.DataForm; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace B3_DongFangWanQi.BO +{ + [DFClass] + [Serializable] + [LogicName("调整次数")] + public class SaleOrderAdjustNumber:Base + { + [LogicName("存货属性ID")] + public long GoodsProperty_ID { get; set; } + + [LogicName("次数")] + public int? AdjustNumber { get; set; } + } +}