需求单No.138263

B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateEdit.cs

@@ -153,7 +153,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;
+    private Label _l1, _l2, _tzNumber;
     private DFContainer _dfContainer;
 
     protected override void InitForm(HtmlForm form) {
@@ -194,8 +194,21 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools {
       _l2.Font.Bold = true;
       _l2.Width = 120;
       panel.Add(_l2);
-
+      panel.Add(new SimpleLabel("屠宰头数"));
+      _tzNumber = new Label();
+      _tzNumber.Font.Size = 12;
+      _tzNumber.Font.Bold = true;
+      _tzNumber.Width = 180;
+      var date = Request.QueryString["date"];
+      if (!string.IsNullOrEmpty(date))
+        _tzNumber.Text = string.Format("{0}头({1})", Request.QueryString["mainNumber"], date);
+      else {
+        _tzNumber.Text = string.Format("{0}头 ", Request.QueryString["mainNumber"]);
+      }
+      panel.Add(_tzNumber);
       vPanel.Add(panel);
+
+
       _dfContainer.AddNonDFControl(_l1, "$l1");
       _dfContainer.AddNonDFControl(_l2, "$l2");
 
@@ -210,7 +223,7 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools {
         if (field.Name == "SecondNumber") {
           var hasSecondUnit = !string.IsNullOrEmpty(detail.Goods_SecondUnit);
           return hasSecondUnit;
-        } 
+        }
         return true;
       };
 
@@ -227,14 +240,14 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools {
       _goodsGrid.Columns.Add(new DFEditGridColumn<DFValueLabel>("Goods_Name"));
 
       _goodsGrid.Columns.Add(new DFEditGridColumn<DFValueLabel>("Goods_Spec"));
-       
+
       var col = new DFEditGridColumn<DFTextBox>("UnitNum");
       col.InitEditControl += (sender, e) => {
         e.Control.Attributes["onchange"] = @"SetSumInfo();this.dfContainer.setValue('ChangeFlag','true');  ";
 
       };
       _goodsGrid.Columns.EAdd(col).SumMode = SumMode.Sum;
-   
+
       _goodsGrid.Columns.Add(new DFEditGridColumn<DFValueLabel>("Unit"));
 
       _goodsGrid.Columns.EAdd(new DFEditGridColumn<DFValueLabel>("Money")).SumMode = SumMode.Sum;
@@ -246,7 +259,7 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools {
       _goodsGrid.ValueColumns.Add("Goods_UnitConvertDirection");
       _goodsGrid.ValueColumns.Add("Goods_MainUnitRatio");
       _goodsGrid.ValueColumns.Add("Goods_SecondUnitRatio");
-      _goodsGrid.ValueColumns.Add("LeftRatio");      
+      _goodsGrid.ValueColumns.Add("LeftRatio");
       _goodsGrid.ValueColumns.Add("Price");
       _goodsGrid.ValueColumns.Add("RightRatio");
 
@@ -269,7 +282,7 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools {
     void SaveBtClick(object sender, EventArgs e) {
       _goodsGrid.GetFromUI();
       var groupByOrderID = Details.Where(x => !string.IsNullOrEmpty(x.ChangeFlag)).GroupBy(x => x.Order_ID);
- 
+
       var bl = BIFactory.Create<IOrderBL>();
       var cannotUpdateID = new List<long>();
       var updateIDs = new List<long>();
@@ -329,22 +342,22 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools {
       base.OnPreRender(e);
       var pageIndex = _goodsGrid.CurrentPageIndex;
       var size = _goodsGrid.PageSize;
-      var index = 0; 
+      var index = 0;
       Money<decimal> unitNum = 0;
-      var number =decimal.Parse(Request.QueryString["number"]);
+      var number = decimal.Parse(Request.QueryString["number"]);
       foreach (var detail in Details) {
         detail.Money = detail.UnitNum * detail.Price;
         var begin = size * pageIndex;
         var end = Math.Min(Details.Count, (pageIndex + 1) * size);
         if (index < begin || index > end - 1) {
-          unitNum += (detail.UnitNum ?? 0); 
+          unitNum += (detail.UnitNum ?? 0);
         }
         index++;
       }
       var s = string.Format(@"<script language=javascript>
 				var sumUnitNumOtherPage = {0};
 				var sumleftOtherPage = {1};  
-			</script>", unitNum,number.ToString("0.00"));
+			</script>", unitNum, number.ToString("0.00"));
       Page.ClientScript.RegisterClientScriptBlock(GetType(), "OtherPageNumber", s, false);
 
       var script = @"
@@ -374,7 +387,7 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools {
       script = script.Replace("{allleftlabel}", _l2.ClientID);
       script = script.Replace("{sumUnitNum}", Details.Sum(x => (x.UnitNum ?? 0).Value).ToString());
       script = script.Replace("{sumleft}", (number - Details.Sum(x => (x.UnitNum ?? 0).Value)).ToString("0.00"));
- 
+
       Page.ClientScript.RegisterStartupScript(this.GetType(), "Startup", script);
 
     }
@@ -452,7 +465,7 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools {
               GoodsBatch_ID = (long?)reader[11],
               GoodsBatch_Name = (string)reader[12],
               LoadTime = (DateTime?)reader[13],
-                OrderDate = (DateTime?)reader[14], 
+              OrderDate = (DateTime?)reader[14],
             };
             Details.Add(detail);
           }
@@ -509,13 +522,13 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools {
     DQueryDom GetStoreDetailDQueryDom() {
       var storeDetail = new JoinAlias(typeof(StoreDetail));
       var store = new JoinAlias(typeof(Store));
-      var query = new DQueryDom(storeDetail); 
-      var goodsProperty = new JoinAlias("_s2",typeof(GoodsProperty));
-      var goods = new JoinAlias("_s3",typeof(SaleGoods));
+      var query = new DQueryDom(storeDetail);
+      var goodsProperty = new JoinAlias("_s2", typeof(GoodsProperty));
+      var goods = new JoinAlias("_s3", typeof(SaleGoods));
 
       query.From.AddJoin(JoinType.Left, new DQDmoSource(goods), DQCondition.EQ(storeDetail, "Goods_ID", goods, "ID"));
       query.From.AddJoin(JoinType.Left, new DQDmoSource(goodsProperty), DQCondition.EQ(goodsProperty, "ID", goods, "GoodsProperty_ID"));
- 
+
       if (GoodsProperty_ID != null) {
         query.Where.Conditions.Add(DQCondition.EQ(goodsProperty, "ID", GoodsProperty_ID));
       }
@@ -541,7 +554,7 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools {
       var id = dom.EExecuteScalar<long?>() ?? 0;
 
       var detail = new JoinAlias(typeof(OutputForecast_Detail));
-      var bill = new JoinAlias(typeof(OutputForecast)); 
+      var bill = new JoinAlias(typeof(OutputForecast));
       var goodsProperty = new JoinAlias("_s5", typeof(GoodsProperty));
 
       var query = new DQueryDom(detail);
@@ -549,7 +562,7 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools {
          DQCondition.EQ(bill, "ID", detail, "OutputForecast_ID"));
 
       query.From.AddJoin(JoinType.Left, new DQDmoSource(goodsProperty), DQCondition.EQ(goodsProperty, "ID", detail, "GoodsProperty_ID"));
- 
+
       if (GoodsProperty_ID != null) {
         query.Where.Conditions.Add(DQCondition.EQ(goodsProperty, "ID", GoodsProperty_ID));
       }

B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateList.cs

@@ -200,8 +200,15 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools {
 
       var idField = (long?)row["GoodsProperty_ID"];
       var number = (( decimal ?)row["可用与预算合计"]) ?? 0;
+      var mainNumber = ((decimal?)row["屠宰头数"]) ?? 0;
+      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("#"));
+      if(date.HasValue)
+      {
+        url = AspUtil.UpdateUrlParam(url, "date", date.Value.ToString("yyyy-MM-dd"));
+      }
       url = AspUtil.UpdateUrlParam(url, "cacheid", "'+__DFContainer.getValue('$HiddenField01')+'");
       bt.Url = url;
       bt.Width = 100;
@@ -234,7 +241,7 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools {
       //汇总可用库存
       RegisgterAvaliableStorageSumTable(dom);
       dom.RegisterQueryTable(typeof(OrderTmp), new[] { "GoodsProperty_ID", "Number", "SecondNumber", "UnitNum" }, GetOrderDQueryDom());
-      dom.RegisterQueryTable(typeof(OutputTmp), new[] { "GoodsProperty_ID", "Number" }, GetOutputDQueryDom());
+      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"));
       dom.From.AddJoin(JoinType.Left, new DQDmoSource(storeDetail), DQCondition.EQ(bill, "GoodsProperty_ID", storeDetail, "GoodsProperty_ID"));
@@ -246,7 +253,8 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools {
 
       dom.Columns.Add(DQSelectColumn.Create(DQExpression.Field(storeDetail, "Number"), "可用库存"));
       dom.Columns.Add(DQSelectColumn.Create(DQExpression.Field(output, "Number"), "测算数量"));
-
+      dom.Columns.Add(DQSelectColumn.Create(DQExpression.Field(output, "MainNumber"), "屠宰头数"));
+      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.Create(
@@ -343,6 +351,11 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools {
       [LogicName("辅数量")]
       public Money<decimal>? SecondNumber { get; set; }
 
+      [LogicName("测试日期")]
+      public DateTime? Date { get; set; }
+
+      [LogicName("屠宰头数")]
+      public decimal ? MainNumber { get; set; }
     }
 
     DQueryDom GetOrderDQueryDom() {
@@ -441,8 +454,11 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools {
 
       query.Columns.Add(DQSelectColumn.Field("GoodsProperty_ID"));
       query.Columns.Add(DQSelectColumn.Create(DQExpression.Sum(DQExpression.Field("Number")), "主数量"));
-
+      query.Columns.Add(DQSelectColumn.Field("Number", bill));
+      query.Columns.Add(DQSelectColumn.Field("Date", bill));
       query.GroupBy.Expressions.Add(DQExpression.Field("GoodsProperty_ID"));
+      query.GroupBy.Expressions.Add(DQExpression.Field(bill, "Number"));
+      query.GroupBy.Expressions.Add(DQExpression.Field(bill, "Date"));
       query.Where.Conditions.Add(DQCondition.EQ(bill, "ID", id));
       query.Where.Conditions.Add(DQCondition.GreaterThan(detail, "GoodsProperty_ID", 0));
       return query;