From d4fab0c47122e32ae0a2fa996208c7243029e106 Mon Sep 17 00:00:00 2001
From: yibo <361071264@qq.com>
Date: Wed, 31 Oct 2018 08:06:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Pages/B3SheepButcherManage/Bills/Pay_/PayEdit.cs  | 10 +++++-----
 B3SheepButcherManage/BO/Bill/FixedPrice/FixedPrice.cs |  6 +++++-
 B3SheepButcherManage/BO/Bill/Pay/Pay.cs               | 11 ++++++++---
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Bills/Pay_/PayEdit.cs b/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Bills/Pay_/PayEdit.cs
index 7fdd94c..3dfc24f 100644
--- a/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Bills/Pay_/PayEdit.cs
+++ b/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Bills/Pay_/PayEdit.cs
@@ -37,7 +37,7 @@ namespace BWP.Web.Pages.B3SheepButcherManage.Bills.Pay_
       config.Add("Date");
       config.Add("Supplier_ID");
       config.Add("Supplier_Bank");
-      config.Add("Supplier_BankAccount");
+      config.Add("Supplier_Card_ID");
       config.Add("Account_ID");
       config.Add("Account_BankAccountNumber");
       config.Add("PaySupplier_ID");
@@ -80,7 +80,7 @@ __DFContainer.setValue('PaySupplier_AccountNo','');
         {
           var script = @"
 var txtValue =parseInt(__DFContainer.getValue('Supplier_ID'));
-simpleRestCall('/MainSystem/B3CowButcherManage/Rpcs/SupplierRpc/GetBySupplierID',[txtValue,['Bank','BankAccount']],
+simpleRestCall('/MainSystem/B3CowButcherManage/Rpcs/SupplierRpc/GetBySupplierID',[txtValue,['Bank','Card_ID']],
 function(result){
 if(typeof(result.Bank)!='undefined')
 {
@@ -90,13 +90,13 @@ else
 {
 __DFContainer.setValue('Supplier_Bank','');
 }
-if(typeof(result.BankAccount)!='undefined')
+if(typeof(result.Card_ID)!='undefined')
 {
-  __DFContainer.setValue('Supplier_BankAccount',result.BankAccount);
+  __DFContainer.setValue('Supplier_Card_ID',result.Card_ID);
 }
 else
 {
-__DFContainer.setValue('Supplier_BankAccount','');
+__DFContainer.setValue('Supplier_Card_ID','');
 }        
 },{ });";
           paySupplierInput.OnClientSelected = script;
diff --git a/B3SheepButcherManage/BO/Bill/FixedPrice/FixedPrice.cs b/B3SheepButcherManage/BO/Bill/FixedPrice/FixedPrice.cs
index 2656ce7..103a3a7 100644
--- a/B3SheepButcherManage/BO/Bill/FixedPrice/FixedPrice.cs
+++ b/B3SheepButcherManage/BO/Bill/FixedPrice/FixedPrice.cs
@@ -8,6 +8,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using TSingSoft.WebControls2;
 
 namespace BWP.B3SheepButcherManage.BO
 {
@@ -17,8 +18,11 @@ namespace BWP.B3SheepButcherManage.BO
   [EditUrl("~/B3SheepButcherManage/Bills/FixedPrice_/FixedPriceEdit.aspx")]
   public class FixedPrice : DepartmentWorkFlowBill
   {
+    DateTime? dt = DateTime.Now;
     [LogicName("执行时间")]
-    public DateTime? ExeTime { get; set; }
+    [DFExtProperty("WebControlType", DFEditControl.DateTimeInput)]
+    [DFNotEmpty]
+    public DateTime? ExeTime { get { return dt; } set { dt = value; } }
 
     private FixedPrice_DetailCollection _detail = new FixedPrice_DetailCollection();
     [OneToMany(typeof(FixedPrice_Detail), "ID")]
diff --git a/B3SheepButcherManage/BO/Bill/Pay/Pay.cs b/B3SheepButcherManage/BO/Bill/Pay/Pay.cs
index 1ddc686..7475b24 100644
--- a/B3SheepButcherManage/BO/Bill/Pay/Pay.cs
+++ b/B3SheepButcherManage/BO/Bill/Pay/Pay.cs
@@ -87,10 +87,15 @@ namespace BWP.B3SheepButcherManage.BO
     [Join("Supplier_ID", "ID")]
     public string Supplier_Bank { get; set; }
 
-    [LogicName("银行账号")]
-    [ReferenceTo(typeof(Supplier), "BankAccount")]
+    //[LogicName("银行账号")]
+    //[ReferenceTo(typeof(Supplier), "BankAccount")]
+    //[Join("Supplier_ID", "ID")]
+    //public string Supplier_BankAccount { get; set; }
+
+    [LogicName("身份证号")]
+    [ReferenceTo(typeof(Supplier), "Card_ID")]
     [Join("Supplier_ID", "ID")]
-    public string Supplier_BankAccount { get; set; }
+    public string Supplier_Card_ID { get; set; }
 
     [LogicName("付款账户")]
     [ReferenceTo(typeof(Account), "Name")]