diff --git a/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/BaseInfos/OutputConfigureEdit.cs b/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/BaseInfos/OutputConfigureEdit.cs index 2b9e125..6becaf6 100644 --- a/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/BaseInfos/OutputConfigureEdit.cs +++ b/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/BaseInfos/OutputConfigureEdit.cs @@ -64,6 +64,7 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.BaseInfos { _grid.Columns.Add(new DFEditGridColumn("GoodsProperty_Name")); _grid.Columns.Add(new DFEditGridColumn("Number")); _grid.Columns.Add(new DFEditGridColumn("Rate")); + _grid.Columns.Add(new DFEditGridColumn("StoreNum")); } diff --git a/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Bills/ProductionNotification_/ProductionNotificationEdit.cs b/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Bills/ProductionNotification_/ProductionNotificationEdit.cs index 5f952d5..cccbe6c 100644 --- a/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Bills/ProductionNotification_/ProductionNotificationEdit.cs +++ b/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Bills/ProductionNotification_/ProductionNotificationEdit.cs @@ -90,14 +90,11 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Bills.ProductionNotification_ _outdetailGrid.Columns.Add(new DFEditGridColumn("OtherOutStore_ID")); _outdetailGrid.Columns.Add(new DFEditGridColumn("Goods_Name")); _outdetailGrid.Columns.Add(new DFEditGridColumn("Goods_Spec")); + _outdetailGrid.Columns.Add(new DFEditGridColumn("Number")); _outdetailGrid.Columns.Add(new DFEditGridColumn("Goods_MainUnit")); + _outdetailGrid.Columns.Add(new DFEditGridColumn("SecondNumber")); _outdetailGrid.Columns.Add(new DFEditGridColumn("Goods_SecondUnit")); - _outdetailGrid.Columns.Add(new DFEditGridColumn("GoodsBatch_Name")); _outdetailGrid.Columns.Add(new DFEditGridColumn("TaxRate")); - _outdetailGrid.Columns.Add(new DFEditGridColumn("Price")); - _outdetailGrid.Columns.Add(new DFEditGridColumn("AccountMoney")); - _outdetailGrid.Columns.Add(new DFEditGridColumn("Number")); - _outdetailGrid.Columns.Add(new DFEditGridColumn("SecondNumber")); } private void CreateAccDetailPanel(TitlePanel titlePanel) diff --git a/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Bills/ProductionNotification_/ProductionNotificationPrint.cs b/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Bills/ProductionNotification_/ProductionNotificationPrint.cs index 63ccdfc..c79d1b2 100644 --- a/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Bills/ProductionNotification_/ProductionNotificationPrint.cs +++ b/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Bills/ProductionNotification_/ProductionNotificationPrint.cs @@ -52,7 +52,7 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Bills.ProductionNotification_ foreach (ProductionNotification_Detail detail in grouping) { - str.Append(""+ detail.Order_ID+ "/"+detail.GoodsProperty_Name+""+detail.LoadTime.Value.Month+"/"+detail.LoadTime.Value.Day+""+detail.Customer_Name+""+detail.Goods_Name+""+detail.SendNumber + ""+detail.Goods_Spec+""+detail.Remark+""); + str.Append(""+ detail.Order_ID+""+detail.LoadTime.Value.Month+"/"+detail.LoadTime.Value.Day+""+detail.Customer_Name+""+detail.Goods_Name+""+detail.SendNumber + ""+detail.Goods_Spec+""+detail.Remark+""); } str.Append(""+(Money<二位小数>?)grouping.Sum(x=>(x.SendNumber??0).Value)+""); } @@ -90,15 +90,15 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Bills.ProductionNotification_ AddSolidSType(str); str.Append(@""); - str.Append(""); + str.Append(""); foreach (IGrouping grouping in Dmo.OutDetails.GroupBy(x => x.Goods_Name)) { foreach (ProductionNotificationOutStore_Detail detail in grouping) { - str.Append(""); + str.Append(""); } - str.Append(""); + str.Append(""); } str.Append(""); return str.ToString(); diff --git a/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateEdit.cs b/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateEdit.cs index 7dec937..2aaa9a4 100644 --- a/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateEdit.cs +++ b/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateEdit.cs @@ -155,7 +155,7 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools { private DFEditGrid _goodsGrid; private QueryContainer _queryContainer; readonly static DFInfo DFInfo = DFInfo.Get(typeof(Order)); - private Label _l1, _l2, _tzNumber, txtRealStoreNumber; + private Label _l1, _l2, _tzNumber; private DFContainer _dfContainer; protected override void InitForm(HtmlForm form) { @@ -204,12 +204,20 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools { _l1.Font.Bold = true; panel.Add(_l1); + //panel.Add(new SimpleLabel("实际库存")); + //txtRealStoreNumber = new Label(); + //txtRealStoreNumber.ID = "txtRealStoreNumber"; + //txtRealStoreNumber.Font.Size = 14; + //txtRealStoreNumber.Font.Bold = true; + //txtRealStoreNumber.Width = 120; + //panel.Add(txtRealStoreNumber); + panel.Add(new SimpleLabel("实际库存")); - txtRealStoreNumber = new Label(); - txtRealStoreNumber.ID = "txtRealStoreNumber"; + var txtRealStoreNumber = new Label(); txtRealStoreNumber.Font.Size = 14; - txtRealStoreNumber.Font.Bold = true; txtRealStoreNumber.Width = 120; + txtRealStoreNumber.Font.Bold = true; + txtRealStoreNumber.Text = Request.QueryString["storeNumber"].ToString(); panel.Add(txtRealStoreNumber); panel.Add(new SimpleLabel("可用与预算合计")); @@ -528,18 +536,18 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools { _goodsGrid.DataBind(); _l1.Text = Math.Round(Details.Sum(x => (decimal?)(x.UnitNum) ?? 0), 2).ToString(); _l2.Text = Math.Round(decimal.Parse(Request.QueryString["number"]) - Details.Sum(x => (decimal?)(x.UnitNum) ?? 0), 2).ToString(); - txtRealStoreNumber.Text = GetSumRealStoreNumber(Details); + //txtRealStoreNumber.Text = GetSumRealStoreNumber(Details); } - private string GetSumRealStoreNumber(List details) - { - var join=new JoinAlias(typeof(StoreDetail)); - var query = new DQueryDom(join); - query.Columns.Add(DQSelectColumn.Sum("Number")); - query.Where.Conditions.Add(DQCondition.InList(DQExpression.Field("Goods_ID"), details.Select(x=>DQExpression.Value(x.SaleGoods_ID)).ToArray())); - var dd = query.EExecuteScalar?>(); - return dd == null ? "0":dd.ToString(); - } + //private string GetSumRealStoreNumber(List details) + //{ + // var join=new JoinAlias(typeof(StoreDetail)); + // var query = new DQueryDom(join); + // query.Columns.Add(DQSelectColumn.Sum("Number")); + // query.Where.Conditions.Add(DQCondition.InList(DQExpression.Field("Goods_ID"), details.Select(x=>DQExpression.Value(x.SaleGoods_ID)).ToArray())); + // var dd = query.EExecuteScalar?>(); + // return dd == null ? "0":dd.ToString(); + //} [DFClass, Serializable] class Order_DetailExt : Order_Detail { diff --git a/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateList.cs b/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateList.cs index df2dc71..70407cd 100644 --- a/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateList.cs +++ b/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateList.cs @@ -217,11 +217,13 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools var number = ((decimal?)row["可用与预算合计"]) ?? 0; var mainNumber = ((decimal?)row["牛头数"]) ?? 0; var currentNumber =Math.Round(Convert.ToDecimal(row["分完数量"]),2); + var storeNumber =Math.Round(Convert.ToDecimal(row["当前库存"]),2); var date = (DateTime?)row["测算日期"]; var url = AspUtil.UpdateUrlParam("SaleOrderUpdateEdit.aspx", "GoodsProperty_ID", (idField ?? 0).ToString()); url = AspUtil.UpdateUrlParam(url, "number", number.ToString()); url = AspUtil.UpdateUrlParam(url, "mainNumber", mainNumber.ToString("#")); url = AspUtil.UpdateUrlParam(url, "currentNumber", currentNumber.ToString()); + url = AspUtil.UpdateUrlParam(url, "storeNumber", storeNumber.ToString()); if (date.HasValue) { url = AspUtil.UpdateUrlParam(url, "date", date.Value.ToString("yyyy-MM-dd")); @@ -261,7 +263,7 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools RegisgterAvaliableStorageSumTable(dom); 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", "GoodsProperty_Name", "Number" }, GetOutputConfigureDom()); + dom.RegisterQueryTable(typeof(OutputConfigTmp), new[] { "GoodsProperty_ID", "GoodsProperty_Name", "Number","StoreNum" }, GetOutputConfigureDom()); dom.From.AddJoin(JoinType.Left, new DQDmoSource(output), DQCondition.EQ(output, "GoodsProperty_ID", outputConfig, "GoodsProperty_ID")); dom.From.AddJoin(JoinType.Left, new DQDmoSource(bill), DQCondition.EQ(bill, "GoodsProperty_ID", output, "GoodsProperty_ID")); dom.From.AddJoin(JoinType.Left, new DQDmoSource(goodsProperty), DQCondition.EQ(output, "GoodsProperty_ID", goodsProperty, "ID")); @@ -273,7 +275,7 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools //dom.Columns.Add(DQSelectColumn.Field("AdjustNum", bill)); dom.Columns.Add(DQSelectColumn.Create(DQExpression.Field(output, "Number"), "分完数量")); - dom.Columns.Add(DQSelectColumn.Create(DQExpression.Field(storeDetail, "Number"), "当前库存")); + dom.Columns.Add(DQSelectColumn.Create(DQExpression.Field(outputConfig, "StoreNum"), "当前库存")); dom.Columns.Add(DQSelectColumn.Create(DQExpression.Field(output, "Date"), "测算日期")); dom.Columns.Add(DQSelectColumn.Create(DQExpression.Field(storeDetail, "Number").EAdd(DQExpression.Field(output, "Number")), "可用与预算合计")); dom.Columns.Add(DQSelectColumn.Field("UnitNum", bill)); @@ -296,6 +298,9 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools [LogicName("主数量")] public Money? Number { get; set; } + [LogicName("库存")] + public Money? StoreNum { get; set; } + } @@ -325,10 +330,12 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools query.Columns.Add(DQSelectColumn.Field("GoodsProperty_ID")); query.Columns.Add(DQSelectColumn.Field("GoodsProperty_Name")); query.Columns.Add(DQSelectColumn.Create(DQExpression.Sum(DQExpression.Field("Number")), "主数量")); + query.Columns.Add(DQSelectColumn.Field("StoreNum")); query.GroupBy.Expressions.Add(DQExpression.Field("ID")); query.GroupBy.Expressions.Add(DQExpression.Field("GoodsProperty_ID")); query.GroupBy.Expressions.Add(DQExpression.Field("GoodsProperty_Name")); + query.GroupBy.Expressions.Add(DQExpression.Field("StoreNum")); query.Where.Conditions.Add(DQCondition.EQ(bill, "ID", id)); query.Where.Conditions.Add(DQCondition.GreaterThan(detail, "GoodsProperty_ID", 0)); return query; diff --git a/B3_DongFangWanQi/BO/OutputConfigure_Detail.cs b/B3_DongFangWanQi/BO/OutputConfigure_Detail.cs index 0e8d371..5abb2f5 100644 --- a/B3_DongFangWanQi/BO/OutputConfigure_Detail.cs +++ b/B3_DongFangWanQi/BO/OutputConfigure_Detail.cs @@ -41,6 +41,9 @@ namespace B3_DongFangWanQi.BO { [LogicName("")] public int? OrderByProperty{ get; set; } + + [LogicName("")] + public Money? StoreNum { get; set; } } [Serializable]
其他出库单号存货规格主单位辅单位批号税率单价往来金额数量辅单位数量
其他出库单号存货规格数量主单位辅单位数量辅单位税率
" + detail.OtherOutStore_ID + "" + detail.Goods_Name +"" + detail.Goods_Spec + "" + detail.Goods_MainUnit + "" + detail.Goods_SecondUnit + "" + detail.GoodsBatch_Name + "" + detail.TaxRate + "" + detail.Price + "" + detail.AccountMoney + "" + detail.Number + "" + detail.SecondNumber + "
" + detail.OtherOutStore_ID + "" + detail.Goods_Name +"" + detail.Goods_Spec + "" + detail.Number + "" + detail.Goods_MainUnit + "" + detail.SecondNumber + "" + detail.Goods_SecondUnit + "" + detail.TaxRate + "
合计" + (Money<二位小数>?)grouping.Sum(x => (x.AccountMoney ?? 0).Value) + "" + (Money<二位小数>?)grouping.Sum(x => (x.Number ?? 0).Value) + "" + (Money<二位小数>?)grouping.Sum(x => (x.SecondNumber ?? 0).Value) + "
合计" + (Money<二位小数>?)grouping.Sum(x => (x.Number ?? 0).Value)+ ""+ (Money<二位小数>?)grouping.Sum(x => (x.SecondNumber ?? 0).Value) + "