From 670f0c15599854c9aad918e7ee58485e042cb845 Mon Sep 17 00:00:00 2001
From: luanhui <1029149336@@qq.com>
Date: Fri, 2 Feb 2018 17:14:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../B3SubstituteKill/Bills/StatPay_/StatPayEdit.cs     |  2 +-
 .../B3SubstituteKill/Bills/StatPay_/StatPayList.cs     |  7 +++++++
 .../B3SubstituteKill/Bills/StatPay_/StatPayList.xml    |  8 ++++++++
 B3SubstituteKill/BL/Bills/StatPay/StatPayBL.cs         | 10 ++++++++++
 WebFolder/config/Plugins/B3SubstituteKill.plugin       |  1 +
 5 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/B3SubstituteKill.Web/Pages/B3SubstituteKill/Bills/StatPay_/StatPayEdit.cs b/B3SubstituteKill.Web/Pages/B3SubstituteKill/Bills/StatPay_/StatPayEdit.cs
index b7af8cc..3d4f5b5 100644
--- a/B3SubstituteKill.Web/Pages/B3SubstituteKill/Bills/StatPay_/StatPayEdit.cs
+++ b/B3SubstituteKill.Web/Pages/B3SubstituteKill/Bills/StatPay_/StatPayEdit.cs
@@ -126,7 +126,7 @@ __DFContainer.setValue('PriceBill_ID','');
       editor.CanDeleteFunc = detail => CanSave;
       editor.IsEditableFunc = (field, detail) =>
       {
-        return CanSave && field.Name == "Number";
+        return CanSave ;//&& field.Name == "Number";
       };
       _costDetail = titlePanel.EAdd(new DFEditGrid(editor) { Width = Unit.Percentage(100) });
       _costDetail.Columns.Add(new DFEditGridColumn("SubKillProductLine_Name"));
diff --git a/B3SubstituteKill.Web/Pages/B3SubstituteKill/Bills/StatPay_/StatPayList.cs b/B3SubstituteKill.Web/Pages/B3SubstituteKill/Bills/StatPay_/StatPayList.cs
index ad2c19b..74d8aa3 100644
--- a/B3SubstituteKill.Web/Pages/B3SubstituteKill/Bills/StatPay_/StatPayList.cs
+++ b/B3SubstituteKill.Web/Pages/B3SubstituteKill/Bills/StatPay_/StatPayList.cs
@@ -19,6 +19,7 @@ namespace BWP.Web.Pages.B3SubstituteKill.Bills.StatPay_
         config.Add("Employee_ID");
         config.Add("Date");
         config.Add("Supplier_ID");
+        config.Add("SourceBillID");
       }));
     }
 
@@ -32,8 +33,14 @@ namespace BWP.Web.Pages.B3SubstituteKill.Bills.StatPay_
         AddDFBrowseGridColumn(grid, "Employee_Name");
         AddDFBrowseGridColumn(grid, "Date");
         AddDFBrowseGridColumn(grid, "Supplier_Name");
+        AddDFBrowseGridColumn(grid, "SourceBillType");
+        AddDFBrowseGridColumn(grid, "SourceBillID");
         AddDFBrowseGridColumn(grid, "Remark");
       }
     }
+
+    public override bool EnableBatchCheck {
+      get { return CheckDefaultRole("批量审核",false); }
+    }
   }
 }
diff --git a/B3SubstituteKill.Web/Pages/B3SubstituteKill/Bills/StatPay_/StatPayList.xml b/B3SubstituteKill.Web/Pages/B3SubstituteKill/Bills/StatPay_/StatPayList.xml
index 4a07e34..046e5e7 100644
--- a/B3SubstituteKill.Web/Pages/B3SubstituteKill/Bills/StatPay_/StatPayList.xml
+++ b/B3SubstituteKill.Web/Pages/B3SubstituteKill/Bills/StatPay_/StatPayList.xml
@@ -66,6 +66,14 @@
         <Field name="BillState"/>
         <QBE paramName ="BillState"/>
       </EQ>
+      <EQ>
+        <Field name="SourceBillType"/>
+        <QBE paramName ="SourceBillType"/>
+      </EQ>
+      <EQ>
+        <Field name="SourceBillID"/>
+        <QBE paramName ="SourceBillID"/>
+      </EQ>
     </And>
   </Where>
 </Select>
diff --git a/B3SubstituteKill/BL/Bills/StatPay/StatPayBL.cs b/B3SubstituteKill/BL/Bills/StatPay/StatPayBL.cs
index 38e616e..d3d8a71 100644
--- a/B3SubstituteKill/BL/Bills/StatPay/StatPayBL.cs
+++ b/B3SubstituteKill/BL/Bills/StatPay/StatPayBL.cs
@@ -23,12 +23,22 @@ namespace BWP.B3SubstituteKill.BL
       {
         dmo.PriceBill_ID = null;
         if (dmo.Date.HasValue && dmo.Supplier_ID.HasValue)
+        {
           dmo.PriceBill_ID = SupplierRpc.GetPriceBillID(dmo.Supplier_ID.Value, dmo.Date.Value);
+        }
       }
+
+
       foreach (var d in dmo.CostDetails)
+      {
         d.Money = d.Price * d.Number;
+
+      }
+
       foreach (var d in dmo.CallbackPayDetails)
+      {
         d.Money = d.Price * d.Number;
+      }
       dmo.ReceiveMoney = dmo.CostDetails.CostMoney - dmo.CallbackPayDetails.CallbackPayMoney;
       base.beforeSave(dmo);
     }
diff --git a/WebFolder/config/Plugins/B3SubstituteKill.plugin b/WebFolder/config/Plugins/B3SubstituteKill.plugin
index 77fde1e..3d8e402 100644
--- a/WebFolder/config/Plugins/B3SubstituteKill.plugin
+++ b/WebFolder/config/Plugins/B3SubstituteKill.plugin
@@ -123,6 +123,7 @@
       <Function index="9" name="作废" />
       <Function index="10" name="完毕"/>
       <Function index="11" name="撤销完毕"/>
+      <Function index="12" name="批量审核"/>
     </FunctionGroup>
     
     <FunctionGroup name="代宰收款" roleSchemas="employee">