需求单No.138103

B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Bills/ProductionNotification_/ProductionNotificationEdit.cs

@@ -88,15 +88,24 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Bills.ProductionNotification_
       _detailGrid = vPanel.Add(new DFEditGrid(detailEditor) { Width = Unit.Percentage(100) });
 
       _detailGrid.Columns.Add(new DFEditGridColumn<DFValueLabel>("Order_ID"));
-      _detailGrid.Columns.Add(new DFEditGridColumn<DFValueLabel>("OrderDate"));
       _detailGrid.Columns.Add(new DFEditGridColumn<DFValueLabel>("LoadTime"));
       _detailGrid.Columns.Add(new DFEditGridColumn<DFValueLabel>("Customer_Name"));
       _detailGrid.Columns.Add(new DFEditGridColumn<DFValueLabel>("Goods_Name"));
+      _detailGrid.Columns.Add(new DFEditGridColumn<DFValueLabel>("Goods_Spec"));
       _detailGrid.Columns.Add(new DFEditGridColumn<DFValueLabel>("UnitNumber"));
       _detailGrid.Columns.Add(new DFEditGridColumn<DFValueLabel>("SendNumber"));
       _detailGrid.Columns.Add(new DFEditGridColumn<DFTextBox>("LoadCarNumber"));
-      _detailGrid.Columns.Add(new DFEditGridColumn<DFValueLabel>("Price"));
-      _detailGrid.Columns.Add(new DFEditGridColumn<DFValueLabel>("Money"));
+
+      if (CheckDefaultRole("显示单价"))
+      {
+        _detailGrid.Columns.Add(new DFEditGridColumn<DFValueLabel>("Price"));
+      }
+      if (CheckDefaultRole("显示金额"))
+      {
+        _detailGrid.Columns.Add(new DFEditGridColumn<DFValueLabel>("Money"));
+      }
+
+      _detailGrid.Columns.Add(new DFEditGridColumn<DFValueLabel>("Remark"));
 
     }
     protected override void OnLoad(EventArgs e)

B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Bills/ProductionNotification_/SelectOrderDialog.cs

@@ -74,6 +74,8 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Bills.ProductionNotification_
         dom.Where.Conditions.Add(DQCondition.EQ(flowdetail, "DepartmentWorkFlowStateCategory_ID", long.Parse(_liuchengfenlei.Value)));
       }
 
+      dom.OrderBy.Expressions.Add(DQOrderByExpression.Create(bill, "LoadTime"));
+      dom.OrderBy.Expressions.Add(DQOrderByExpression.Create(bill, "ID"));
       return dom;
     }
   }

B3_DongFangWanQi/BL/ProductionNotificationBL_/ProductionNotificationBL.cs

@@ -66,17 +66,18 @@ namespace B3_DongFangWanQi.BL
           var dmodetail = new ProductionNotification_Detail();
           dmodetail.Order_ID = order.ID;
           dmodetail.OrderDetail_ID = orderDetail.ID;
-          dmodetail.OrderDate = order.OrderDate;
           dmodetail.LoadTime = order.LoadTime;
           dmodetail.Customer_ID = order.Customer_ID;
           dmodetail.Customer_Name = order.Customer_Name;
           dmodetail.Goods_ID = orderDetail.SaleGoods_ID;
           dmodetail.Goods_Name = orderDetail.Goods_Name;
+          dmodetail.Goods_Spec = orderDetail.Goods_Spec;
           dmodetail.UnitNumber = orderDetail.UnitNum;
           dmodetail.SendNumber = orderDetail.UnitNum;
           dmodetail.LoadCarNumber = orderDetail.UnitNum;
           dmodetail.Price = orderDetail.Price;
           dmodetail.Money = orderDetail.Money;
+          dmodetail.Remark = orderDetail.Remark;
           dmo.Details.Add(dmodetail);
         }
       }

B3_DongFangWanQi/BO/Bill/ProductionNotification_/ProductionNotification_Detail.cs

@@ -24,11 +24,6 @@ namespace B3_DongFangWanQi.BO
     [LogicName("订单明细号")]
     public long? OrderDetail_ID { get; set; }
 
-    [LogicName("订货时间")]
-    [ReferenceTo(typeof(Order), "OrderDate")]
-    [Join("Order_ID", "ID")]
-    public DateTime? OrderDate { get; set; }
-
     [LogicName("发货时间")]
     [ReferenceTo(typeof(Order), "LoadTime")]
     [Join("Order_ID", "ID")]
@@ -50,10 +45,15 @@ namespace B3_DongFangWanQi.BO
     [Join("Goods_ID", "ID")]
     public string Goods_Name { get; set; }
 
+    [LogicName("规格")]
+    [ReferenceTo(typeof(Goods), "Spec")]
+    [Join("Goods_ID", "ID")]
+    public string Goods_Spec { get; set; }
+
     [LogicName("订货数量")]
     public Money<decimal>? UnitNumber { get; set; }
 
-    [LogicName("发货数量")]
+    [LogicName("调整数量")]
     public Money<decimal>? SendNumber { get; set; }
 
     [LogicName("装车数量")]
@@ -65,6 +65,10 @@ namespace B3_DongFangWanQi.BO
     [LogicName("金额")]
     public Money<金额>? Money { get; set; }
 
+
+    [LogicName("备注")]
+    public string Remark { get; set; }
+
   }
   [Serializable]
   public class ProductionNotification_DetailCollection : DmoCollection<ProductionNotification_Detail>

WebFolder/Config/Plugins/B3_DongFangWanQi.Plugin

@@ -56,6 +56,8 @@
       <Function index="7" name="解锁" />
       <Function index="8" name="管理" />
       <Function index="9" name="作废" />
+      <Function index="10" name="显示单价" />
+      <Function index="11" name="显示金额" />
     </FunctionGroup>
     
   </Security>