需求单No.139253

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

@@ -173,30 +173,8 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools {
       form.Controls.Add(_dfContainer);
 
       var panel = new HLayoutPanel();
-      panel.Add(new SimpleLabel("可用与预算合计"));
-      var label = new Label();
-      label.Font.Size = 14;
-      label.Width = 120;
-      label.Font.Bold = true;
-      label.Text = decimal.Parse(Request.QueryString["number"]).ToString("0.00");
-      panel.Add(label);
-
-      panel.Add(new SimpleLabel("合计订货数量"));
-      _l1 = new Label();
-      _l1.ID = "l1";
-      _l1.Font.Size = 14;
-      _l1.Width = 120;
-      _l1.Font.Bold = true;
-      panel.Add(_l1);
 
-      panel.Add(new SimpleLabel("预计剩余数量"));
-      _l2 = new Label();
-      _l2.ID = "l2";
-      _l2.Font.Size = 14;
-      _l2.Font.Bold = true;
-      _l2.Width = 120;
-      panel.Add(_l2);
-      panel.Add(new SimpleLabel("屠宰头数"));
+      panel.Add(new SimpleLabel("预计牛头数"));
       _tzNumber = new Label();
       _tzNumber.Font.Size = 12;
       _tzNumber.Font.Bold = true;
@@ -204,11 +182,28 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools {
       var date = Request.QueryString["date"];
       if (!string.IsNullOrEmpty(date))
         _tzNumber.Text = string.Format("{0}头({1})", Request.QueryString["mainNumber"], date);
-      else {
+      else
+      {
         _tzNumber.Text = string.Format("{0}头 ", Request.QueryString["mainNumber"]);
       }
       panel.Add(_tzNumber);
 
+      panel.Add(new SimpleLabel("当前牛头数产值"));
+      var label2 = new Label();
+      label2.Font.Size = 14;
+      label2.Width = 120;
+      label2.Font.Bold = true;
+      label2.Text = Request.QueryString["mainNumber"].ToString();
+      panel.Add(label2);
+
+      panel.Add(new SimpleLabel("合计订货数量"));
+      _l1 = new Label();
+      _l1.ID = "l1";
+      _l1.Font.Size = 14;
+      _l1.Width = 120;
+      _l1.Font.Bold = true;
+      panel.Add(_l1);
+
       panel.Add(new SimpleLabel("实际库存"));
       txtRealStoreNumber = new Label();
       txtRealStoreNumber.ID = "txtRealStoreNumber";
@@ -217,6 +212,22 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools {
       txtRealStoreNumber.Width = 120;
       panel.Add(txtRealStoreNumber);
 
+      panel.Add(new SimpleLabel("可用与预算合计"));
+      var label = new Label();
+      label.Font.Size = 14;
+      label.Width = 120;
+      label.Font.Bold = true;
+      label.Text = decimal.Parse(Request.QueryString["number"]).ToString("0.00");
+      panel.Add(label);
+
+      panel.Add(new SimpleLabel("预计剩余数量"));
+      _l2 = new Label();
+      _l2.ID = "l2";
+      _l2.Font.Size = 14;
+      _l2.Font.Bold = true;
+      _l2.Width = 120;
+      panel.Add(_l2);
+
       vPanel.Add(panel);
 
       _dfContainer.AddNonDFControl(_l1, "$l1");

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

@@ -160,13 +160,15 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools {
       };
 
       _grid.Columns.Add(new DFBrowseGridColumn("GoodsProperty_Name"));
-      _grid.Columns.Add(new DFBrowseGridColumn("UnitNum"));
-      _grid.Columns.Add(new DFBrowseGridColumn("可用库存"));
-      _grid.Columns.Add(new DFBrowseGridColumn("测算数量"));
+      _grid.Columns.Add(new DFBrowseGridColumn("单品测算数量"));
+      _grid.Columns.Add(new DFBrowseGridColumn("牛头数"));
+      _grid.Columns.Add(new DFBrowseGridColumn("分完数量"));
+      _grid.Columns.Add(new DFBrowseGridColumn("当前库存"));
       _grid.Columns.Add(new DFBrowseGridColumn("可用与预算合计"));
-      _grid.Columns.Add(new DFBrowseGridColumn("AdjustNumber"));
+      _grid.Columns.Add(new DFBrowseGridColumn("UnitNum"));
+      //_grid.Columns.Add(new DFBrowseGridColumn("AdjustNumber"));
       _grid.Columns.Add(new DFBrowseGridColumn("预计剩余数量"));
-      _grid.Columns.Add(new DFBrowseGridColumn("预计剩余头数"));
+      //_grid.Columns.Add(new DFBrowseGridColumn("预计剩余头数"));
       _grid.OnDetailDataBound += (htmlRow, dataRow, o) => {
         var row = dataRow as DFDataRow;
         if (row == null)
@@ -201,7 +203,7 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools {
 
       var idField = (long?)row["GoodsProperty_ID"];
       var number = (( decimal ?)row["可用与预算合计"]) ?? 0;
-      var mainNumber = ((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());
@@ -250,14 +252,15 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools {
       dom.From.AddJoin(JoinType.Left, new DQDmoSource(outputConfig), DQCondition.EQ(bill, "GoodsProperty_ID", outputConfig, "GoodsProperty_ID"));
       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.Create(DQExpression.Field(outputConfig,"Number"),"单品测算数量"));
+      dom.Columns.Add(DQSelectColumn.Create(DQExpression.Field(output, "MainNumber"), "牛头数"));
       //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"), "测算数量"));
-      dom.Columns.Add(DQSelectColumn.Create(DQExpression.Field(output, "MainNumber"), "屠宰头数"));
+      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(output, "Date"), "测算日期"));
       dom.Columns.Add(DQSelectColumn.Create(DQExpression.Field(storeDetail, "Number").EAdd(DQExpression.Field(output, "Number")), "可用与预算合计"));
+      dom.Columns.Add(DQSelectColumn.Field("UnitNum", bill));
 
       dom.Columns.Add(DQSelectColumn.Create(
         ESubtract(DQExpression.Field(storeDetail, "Number").EAdd(DQExpression.Field(output, "Number")), DQExpression.Field(bill, "UnitNum")), "预计剩余数量"));
@@ -359,7 +362,7 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools {
       [LogicName("测试日期")]
       public DateTime? Date { get; set; }
 
-      [LogicName("屠宰头数")]
+      [LogicName("牛头数")]
       public decimal ? MainNumber { get; set; }
     }