需求单No.139563

需求单No.139562
需求单No.139520

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<DFValueLabel>("GoodsProperty_Name"));
       _grid.Columns.Add(new DFEditGridColumn<DFTextBox>("Number"));
       _grid.Columns.Add(new DFEditGridColumn<DFTextBox>("Rate"));
+      _grid.Columns.Add(new DFEditGridColumn<DFTextBox>("StoreNum"));
 
     }
 

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<DFValueLabel>("OtherOutStore_ID"));
       _outdetailGrid.Columns.Add(new DFEditGridColumn<DFValueLabel>("Goods_Name"));
       _outdetailGrid.Columns.Add(new DFEditGridColumn<DFValueLabel>("Goods_Spec"));
+      _outdetailGrid.Columns.Add(new DFEditGridColumn<DFValueLabel>("Number"));
       _outdetailGrid.Columns.Add(new DFEditGridColumn<DFValueLabel>("Goods_MainUnit"));
+      _outdetailGrid.Columns.Add(new DFEditGridColumn<DFValueLabel>("SecondNumber"));
       _outdetailGrid.Columns.Add(new DFEditGridColumn<DFValueLabel>("Goods_SecondUnit"));
-      _outdetailGrid.Columns.Add(new DFEditGridColumn<DFValueLabel>("GoodsBatch_Name"));
       _outdetailGrid.Columns.Add(new DFEditGridColumn<DFValueLabel>("TaxRate"));
-      _outdetailGrid.Columns.Add(new DFEditGridColumn<DFValueLabel>("Price"));
-      _outdetailGrid.Columns.Add(new DFEditGridColumn<DFValueLabel>("AccountMoney"));
-      _outdetailGrid.Columns.Add(new DFEditGridColumn<DFValueLabel>("Number"));
-      _outdetailGrid.Columns.Add(new DFEditGridColumn<DFValueLabel>("SecondNumber"));
     }
 
     private void CreateAccDetailPanel(TitlePanel titlePanel)

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("<tr><td>"+ detail.Order_ID+ "/"+detail.GoodsProperty_Name+"</td><td>"+detail.LoadTime.Value.Month+"/"+detail.LoadTime.Value.Day+"</td><td>"+detail.Customer_Name+"</td><td>"+detail.Goods_Name+"</td><td>"+detail.SendNumber + "</td><td>"+detail.Goods_Spec+"</td><td>"+detail.Remark+"</td></tr>");
+          str.Append("<tr><td>"+ detail.Order_ID+"</td><td>"+detail.LoadTime.Value.Month+"/"+detail.LoadTime.Value.Day+"</td><td>"+detail.Customer_Name+"</td><td>"+detail.Goods_Name+"</td><td>"+detail.SendNumber + "</td><td>"+detail.Goods_Spec+"</td><td>"+detail.Remark+"</td></tr>");
         }
         str.Append("<tr><td></td><td></td><td></td><td></td><td>"+(Money<二位小数>?)grouping.Sum(x=>(x.SendNumber??0).Value)+"</td><td></td><td></td></tr>");
       }
@@ -90,15 +90,15 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Bills.ProductionNotification_
       AddSolidSType(str);
       str.Append(@"<table border='1' width='100%'>");
 
-      str.Append("<tr><td>其他出库单号</td><td>存货</td><td>规格</td><td>主单位</td><td>辅单位</td><td>批号</td><td>税率</td><td>单价</td><td>往来金额</td><td>数量</td><td>辅单位数量</td></tr>");
+      str.Append("<tr><td>其他出库单号</td><td>存货</td><td>规格</td><td>数量</td><td>主单位</td><td>辅单位数量</td><td>辅单位</td><td>税率</td></tr>");
 
       foreach (IGrouping<string, ProductionNotificationOutStore_Detail> grouping in Dmo.OutDetails.GroupBy(x => x.Goods_Name))
       {
         foreach (ProductionNotificationOutStore_Detail detail in grouping)
         {
-          str.Append("<tr><td>" + detail.OtherOutStore_ID + "</td><td>" + detail.Goods_Name +"</td><td>" + detail.Goods_Spec + "</td><td>" + detail.Goods_MainUnit + "</td><td>" + detail.Goods_SecondUnit + "</td><td>" + detail.GoodsBatch_Name + "</td><td>" + detail.TaxRate + "</td><td>" + detail.Price + "</td><td>" + detail.AccountMoney + "</td><td>" + detail.Number + "</td><td>" + detail.SecondNumber + "</td></tr>");
+          str.Append("<tr><td>" + detail.OtherOutStore_ID + "</td><td>" + detail.Goods_Name +"</td><td>" + detail.Goods_Spec + "</td><td>" + detail.Number + "</td><td>" + detail.Goods_MainUnit + "</td><td>" + detail.SecondNumber + "</td><td>" + detail.Goods_SecondUnit + "</td><td>" + detail.TaxRate + "</td></tr>");
         }
-        str.Append("<tr><td colspan='8'>合计</td><td>" + (Money<二位小数>?)grouping.Sum(x => (x.AccountMoney ?? 0).Value) + "</td><td>" + (Money<二位小数>?)grouping.Sum(x => (x.Number ?? 0).Value) + "</td><td>" + (Money<二位小数>?)grouping.Sum(x => (x.SecondNumber ?? 0).Value) + "</td></tr>");
+        str.Append("<tr><td colspan='3'>合计</td><td>" + (Money<二位小数>?)grouping.Sum(x => (x.Number ?? 0).Value)+ "</td><td></td><td>"+ (Money<二位小数>?)grouping.Sum(x => (x.SecondNumber ?? 0).Value) + "</td><td></td><td></td></tr>");
       }
       str.Append("</div>");
       return str.ToString();

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<Order_DetailExt> 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<Money<decimal>?>();
-      return dd == null ? "0":dd.ToString();
-    }
+    //private string GetSumRealStoreNumber(List<Order_DetailExt> 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<Money<decimal>?>();
+    //  return dd == null ? "0":dd.ToString();
+    //}
 
     [DFClass, Serializable]
     class Order_DetailExt : Order_Detail {

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<decimal>? Number { get; set; }
 
+      [LogicName("库存")]
+      public Money<decimal>? 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;

B3_DongFangWanQi/BO/OutputConfigure_Detail.cs

@@ -41,6 +41,9 @@ namespace B3_DongFangWanQi.BO {
 
     [LogicName("ÅÅÐò")]
     public int? OrderByProperty{ get; set; }
+
+    [LogicName("¿â´æ")]
+    public Money<decimal>? StoreNum { get; set; }
   }
 
   [Serializable]