需求单No.138539

B3SubstituteKill.Web/Pages/B3SubstituteKill/Bills/SubKillWeightBill_/SubKillWeightBillEdit.cs

@@ -35,6 +35,8 @@ namespace BWP.Web.Pages.B3SubstituteKill.Bills.SubKillWeightBill_
       config.Add("Supplier_Address");
       config.Add("Number");
       config.Add("Weight");
+      config.Add("MaoWeight");
+      config.Add("PiWeight");
       config.Add("PriceBill_ID");
       config.Add("Remark");
       layoutManager.Config = config;

B3SubstituteKill.Web/Pages/B3SubstituteKill/Bills/SubKillWeightBill_/SubKillWeightBillList.cs

@@ -33,6 +33,9 @@ namespace BWP.Web.Pages.B3SubstituteKill.Bills.SubKillWeightBill_
         AddDFBrowseGridColumn(grid, "Employee_Name");
         AddDFBrowseGridColumn(grid, "Date");
         AddDFBrowseGridColumn(grid, "Supplier_Name");
+        AddDFBrowseGridColumn(grid, "MaoWeight");
+        AddDFBrowseGridColumn(grid, "PiWeight");
+        AddDFBrowseGridColumn(grid, "Weight");
         AddDFBrowseGridColumn(grid, "Remark");
       }
     }

B3SubstituteKill/BL/Bills/SubKillWeightBill/SubKillWeightBillBL.cs

@@ -37,6 +37,8 @@ namespace BWP.B3SubstituteKill.BL
         dmo.PriceBill_ID = SupplierRpc.GetPriceBillID(dmo.Supplier_ID.Value, dmo.Date.Value);
       dmo.Number = dmo.Details.Sum(x => x.Number ?? 0);
       dmo.Weight = dmo.Details.Sum(x => x.Weight.EToDecimal() ?? 0);
+      dmo.MaoWeight = dmo.Details.Sum(x => x.MaoWeight.EToDecimal() ?? 0);
+      dmo.PiWeight = dmo.Details.Sum(x => x.PiWeight.EToDecimal() ?? 0);
       base.beforeSave(dmo);
     }
 

B3SubstituteKill/BO/Bills/SubKillWeightBill/SubKillWeightBill.cs

@@ -68,6 +68,15 @@ namespace BWP.B3SubstituteKill.BO
     [DFExtProperty("WebControlType", DFEditControl.StaticText)]
     public Money<decimal> Weight { get; set; }
 
+    [LogicName("代宰毛重")]
+    [DFExtProperty("WebControlType", DFEditControl.StaticText)]
+    public Money<decimal> MaoWeight { get; set; }
+
+    [LogicName("代宰皮重")]
+    [DFExtProperty("WebControlType", DFEditControl.StaticText)]
+    public Money<decimal> PiWeight { get; set; }
+
+
     [LogicName("价格单号")]
     [DFExtProperty("WebControlType", DFEditControl.StaticText)]
     public long? PriceBill_ID { get; set; }