From 58758cab891e0a1cbe060f2ce8fda0805cdfc99a Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 03 一月 2025 08:44:40 +0800
Subject: [PATCH] 保证金

---
 CY_ECommercePlatform/CY.BLL/CY.BLL.csproj                                                |    2 
 CY_ECommercePlatform/CY.WebForm/Pages/financial/FirmAccountExpensesList.aspx             |    2 
 CY_ECommercePlatform/CY.WebForm/Pages/financial/FirmAccountIncomeList.aspx.cs            |    2 
 CY_ECommercePlatform/CY.WebForm/Pages/financial/FirmAccountExpensesEdit.aspx.cs          |   58 
 CY_ECommercePlatform/CY.SQLDAL/OA/OA_BaozhengjincuishouDAL.cs                            |  234 +++
 CY_ECommercePlatform/CY.WebForm/Pages/business/BaozhengjinCuishou.aspx.designer.cs       |   98 +
 CY_ECommercePlatform/CY.WebForm/Pages/financial/FirmAccountExpensesEdit.aspx.designer.cs |   45 
 CY_ECommercePlatform/CY.WebForm/Pages/business/Baozhengjinfukuan.aspx                    |  396 ++++++
 CY_ECommercePlatform/CY.WebForm/Pages/financial/BaozhengjinIncome.aspx.designer.cs       |  116 +
 CY_ECommercePlatform/CY.Model/OA/OA_Baozhengjincuishou.cs                                |  138 ++
 CY_ECommercePlatform/CY.WebForm/Pages/business/Baozhengjinfukuan.aspx.designer.cs        |  143 ++
 CY_ECommercePlatform/AbstractFactory/Factory.cs                                          |   12 
 CY_ECommercePlatform/CY.BLL/OA/OA_BaozhengjincuishouBLL.cs                               |  141 ++
 CY_ECommercePlatform/CY.SQLDAL/OA/OA_ProcurementDAL.cs                                   |   12 
 CY_ECommercePlatform/CY.WebForm/Pages/financial/FirmAccountExpensesList.aspx.designer.cs |   44 
 CY_ECommercePlatform/CY.Model/CY.Model.csproj                                            |    2 
 CY_ECommercePlatform/CY.Model/OA/OA_Kaipiaonewcuishou.cs                                 |    2 
 CY_ECommercePlatform/CY.SQLDAL/OA/OA_BaozhengjinDAL.cs                                   |  285 ++++
 CY_ECommercePlatform/CY.WebForm/Pages/business/BaozhengjinCuishou.aspx                   |  112 +
 CY_ECommercePlatform/CY.BLL/OA/OA_BaozhengjinBLL.cs                                      |  214 +++
 CY_ECommercePlatform/CY.IDAL/OA/IOA_BaozhengjinDAL.cs                                    |   32 
 CY_ECommercePlatform/CY.WebForm/Pages/business/Baozhengjinfukuan.aspx.cs                 |  815 ++++++++++++
 CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj                                        |   24 
 CY_ECommercePlatform/CY.Model/OA/OA_Baozhengjin.cs                                       |  311 ++++
 CY_ECommercePlatform/CY.IDAL/OA/IOA_BaozhengjincuishouDAL.cs                             |   29 
 CY_ECommercePlatform/CY.SQLDAL/CY.SQLDAL.csproj                                          |    2 
 CY_ECommercePlatform/CY.WebForm/Pages/financial/BaozhengjinIncome.aspx                   |  166 ++
 CY_ECommercePlatform/CY.WebForm/Pages/financial/BaozhengjinIncome.aspx.cs                |  287 ++++
 CY_ECommercePlatform/CY.IDAL/CY.IDAL.csproj                                              |    2 
 CY_ECommercePlatform/CY.WebForm/Pages/financial/FirmAccountExpensesEdit.aspx             |   33 
 CY_ECommercePlatform/CY.WebForm/Pages/business/BaozhengjinCuishou.aspx.cs                |  170 ++
 31 files changed, 3,885 insertions(+), 44 deletions(-)

diff --git a/CY_ECommercePlatform/AbstractFactory/Factory.cs b/CY_ECommercePlatform/AbstractFactory/Factory.cs
index dfeb058..b975b6e 100644
--- a/CY_ECommercePlatform/AbstractFactory/Factory.cs
+++ b/CY_ECommercePlatform/AbstractFactory/Factory.cs
@@ -263,6 +263,8 @@
             OBJECT_PATH.Add(DALInterface.IOA_KaipiaonewhuikuanDAL, "OA_KaipiaonewhuikuanDAL");
             OBJECT_PATH.Add(DALInterface.IOA_KaipiaoJineQuerenDAL, "OA_KaipiaoJineQuerenDAL");
             OBJECT_PATH.Add(DALInterface.IOA_FukuanshenqingDAL, "OA_FukuanshenqingDAL");
+            OBJECT_PATH.Add(DALInterface.IOA_BaozhengjincuishouDAL, "OA_BaozhengjincuishouDAL");
+            OBJECT_PATH.Add(DALInterface.IOA_BaozhengjinDAL, "OA_BaozhengjinDAL");
             OBJECT_PATH.Add(DALInterface.IOA_KaipiaonewDAL, "OA_KaipiaonewDAL");
             OBJECT_PATH.Add(DALInterface.ICoreCmsPlanOrderDAL, "CoreCmsPlanOrderDAL");
             OBJECT_PATH.Add(DALInterface.ICoreCmsPlanOrderItemDAL, "CoreCmsPlanOrderItemDAL");
@@ -897,6 +899,16 @@
         /// <summary>
         /// 寮�绁ㄧ敵璇�
         /// </summary>
+        IOA_BaozhengjincuishouDAL = 1936,
+        /// <summary>
+        /// 寮�绁ㄧ敵璇�
+        /// </summary>
+        IOA_BaozhengjinDAL = 1937,
+        
+
+        /// <summary>
+        /// 寮�绁ㄧ敵璇�
+        /// </summary>
         IOA_KaipiaonewDAL = 1932,
         
         /// <summary>
diff --git a/CY_ECommercePlatform/CY.BLL/CY.BLL.csproj b/CY_ECommercePlatform/CY.BLL/CY.BLL.csproj
index d2ef29b..6379413 100644
--- a/CY_ECommercePlatform/CY.BLL/CY.BLL.csproj
+++ b/CY_ECommercePlatform/CY.BLL/CY.BLL.csproj
@@ -155,6 +155,8 @@
     <Compile Include="LF\LF_OrderFileBLL.cs" />
     <Compile Include="OA\CoreCmsPlanOrderBLL.cs" />
     <Compile Include="OA\CoreCmsPlanOrderItemBLL.cs" />
+    <Compile Include="OA\OA_BaozhengjinBLL.cs" />
+    <Compile Include="OA\OA_BaozhengjincuishouBLL.cs" />
     <Compile Include="OA\OA_CarDictionaryBLL.cs" />
     <Compile Include="OA\OA_CarExaminedBLL.cs" />
     <Compile Include="OA\OA_CarInsuranceBLL.cs" />
diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_BaozhengjinBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_BaozhengjinBLL.cs
new file mode 100644
index 0000000..8e0b40d
--- /dev/null
+++ b/CY_ECommercePlatform/CY.BLL/OA/OA_BaozhengjinBLL.cs
@@ -0,0 +1,214 @@
+锘�
+/**  
+* OA_BaozhengjinBLL.cs
+*
+* 鍔� 鑳斤細 鍚堜綔瀹㈡埛涓氬姟閫昏緫绫�
+* 绫� 鍚嶏細 OA_BaozhengjinBLL
+*
+* Ver    鍙樻洿鏃ユ湡             璐熻矗浜�  鍙樻洿鍐呭
+* 鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�
+* V0.01  2013-4-2 15:11       鍚磋緣      鍒濈増
+* V0.02  2013-5-29 17:43      鍚村磶鍧�    澧炲姞杞崲鍦ㄧ嚎浼氬憳涓哄巶鍟嗗鎴锋柟娉� 
+*
+*
+*
+*
+*
+*
+*/
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using CY.IDAL;
+using CY.Model;
+using AbstractFactory;
+using CY.IBaseDAL;
+using CY.Infrastructure.DESEncrypt;
+using CY.Infrastructure.Query;
+
+namespace CY.BLL
+{
+    public class OA_BaozhengjinBLL
+    {
+        IOA_BaozhengjinDAL _IOA_BaozhengjinDAL = null;
+
+        /// <summary>
+        /// 鍒濆鍖栨瀯閫�
+        /// </summary>
+        public OA_BaozhengjinBLL()
+        {
+            //鑾峰彇OA_Baozhengjin DAL瀹炵幇
+            _IOA_BaozhengjinDAL = Factory.GetDALByInterfaceName(DALInterface.IOA_BaozhengjinDAL) as IOA_BaozhengjinDAL;
+
+
+        }
+
+        /// <summary>
+        /// 鏂板閫佽揣瀹夋帓
+        /// </summary>
+        /// <param name="rType"></param>
+        /// <param name="m_OA_CustomerCommunications"></param>
+        /// <param name="m_EC_AcceptWayByCustomers"></param>
+        /// <returns></returns>
+        public bool InsertModel(CY.Model.OA_Baozhengjin m_OA_Baozhengjin)
+        {
+            try
+            {
+
+                return _IOA_BaozhengjinDAL.InserModel(m_OA_Baozhengjin);
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+        /// <summary>
+        /// 淇敼閫佽揣瀹夋帓
+        /// </summary>
+        /// <param name="rType"></param>
+        /// <returns></returns>
+        public bool UpdateModel(CY.Model.OA_Baozhengjin m_OA_Baozhengjin)
+        {
+            try
+            {
+                return _IOA_BaozhengjinDAL.UpdateModel(m_OA_Baozhengjin);
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+        /// <summary>
+        /// 鑾峰彇鍏ㄩ儴鍚堜綔瀹㈡埛
+        /// </summary>
+        /// <param name="Keyid">涓婚敭id</param>
+        /// <returns></returns>
+        public IEnumerable<OA_Baozhengjin> GetModelList()
+        {
+            Query query = new Query();
+            return _IOA_BaozhengjinDAL.SelectAllModel(query);
+        }
+
+
+        /// <summary>
+        /// 鏍规嵁formid鑾峰緱淇℃伅
+        /// </summary>
+        /// <param name="Keyid">缂栧彿</param>
+        /// <returns></returns>
+        public IEnumerable<Model.OA_Baozhengjin> GetModelByformid(Guid formid)
+        {
+
+            return _IOA_BaozhengjinDAL.GetModelByformid(formid);
+        }
+
+        /// <summary>
+        /// 鑾峰彇鍏ㄩ儴鍚堜綔瀹㈡埛
+        /// </summary>
+        /// <param name="Keyid">涓婚敭id</param>
+        /// <returns></returns>
+        public OA_Baozhengjin GetModelByKeyid(int keyid)
+        {
+
+            return _IOA_BaozhengjinDAL.GetModelByKeyid(keyid);
+        }
+
+        /// <summary>
+        /// 鍒犻櫎鍚堜綔瀹㈡埛
+        /// </summary>
+        /// <param name="rType"></param>
+        /// <returns></returns>
+        public bool DeleteModel(CY.Model.OA_Baozhengjin rType)
+        {
+            try
+            {
+                _IOA_BaozhengjinDAL.DeleteModel(rType);
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+            return true;
+        }
+
+        /// <summary>
+        /// 鏌ヨ鍚堜綔瀹㈡埛鍒嗛〉鍒楄〃
+        /// </summary>
+        /// <param name="pa"></param>
+        /// <returns></returns>
+        public IEnumerable<OA_Baozhengjin> SelectModelPage(Pagination pa, Guid FirmId, string CreateTimeStart, string CreateTimeEnd,
+   string Zhanghuleixing, string Fukuanzhanghu, string Shoukuandanwei, string remark, string TuikuanStatus)
+        {
+            string Condition = " and ok.FirmId ='" + FirmId + "'  ";
+
+            if (!string.IsNullOrEmpty(CreateTimeStart))
+                Condition += " and DATEDIFF(day,ok.[CreateTime],'" + CreateTimeStart + "')<=0 ";
+
+            if (!string.IsNullOrEmpty(CreateTimeEnd))
+                Condition += " and DATEDIFF(day,ok.[CreateTime],'" + CreateTimeEnd + "')>=0 ";
+
+            if (!string.IsNullOrEmpty(Zhanghuleixing))
+                Condition += " and  ok.ReceiveWay = '" + Zhanghuleixing + "'";
+
+            if (!string.IsNullOrEmpty(Fukuanzhanghu))
+                Condition += " and  ok.Account = " + Fukuanzhanghu + "    ";
+            if (!string.IsNullOrEmpty(Shoukuandanwei))
+                Condition += " and  ok.Shoukuandanwei like '%" + Shoukuandanwei + "%'    ";
+            if (!string.IsNullOrEmpty(remark))
+                Condition += " and  ok.remark   like '%" + remark + "%' ";
+            if (!string.IsNullOrEmpty(TuikuanStatus))
+                Condition += " and  ok.[TuikuanStatus] = '" + TuikuanStatus + "'";
+
+            Query query = new Query();
+            IList<Criterion> criterias = new List<Criterion>()
+            {
+                new Criterion("", Condition),
+
+                new Criterion("orderBy"," CreateTime desc   ")
+            };
+            query.Criteria = criterias;
+            return _IOA_BaozhengjinDAL.SelectModelPage(query, pa);
+        }
+
+
+        /// <summary>
+        /// 鏌ヨ鍚堜綔瀹㈡埛鍒嗛〉鍒楄〃
+        /// </summary>
+        /// <param name="pa"></param>
+        /// <returns></returns>
+        public IEnumerable<OA_Baozhengjin> SelectModelPageweikaipiao(Pagination pa, Guid FirmId, string CreateTimeStart, string CreateTimeEnd,
+   string Creater, string SupplierName, string shifoufukuan, string selFukuanyongtu)
+        {
+            string Condition = " and ok.FirmId ='" + FirmId + "' and ok.ApprovalStatus = 1 and ok.Youwufapiao !=2 and ok.FukuanStatus = 2 ";
+
+            if (!string.IsNullOrEmpty(CreateTimeStart))
+                Condition += " and DATEDIFF(day,ok.[CreateTime],'" + CreateTimeStart + "')<=0 ";
+
+            if (!string.IsNullOrEmpty(CreateTimeEnd))
+                Condition += " and DATEDIFF(day,ok.[CreateTime],'" + CreateTimeEnd + "')>=0 ";
+
+            if (!string.IsNullOrEmpty(Creater))
+                Condition += " and  ok.Creater like '%" + Creater + "%'";
+
+            if (!string.IsNullOrEmpty(SupplierName))
+                Condition += " and  ok.SupplierName like '%" + SupplierName + "%'    ";
+            if (!string.IsNullOrEmpty(shifoufukuan))
+                Condition += " and  ok.FukuanStatus = '" + shifoufukuan + "'";
+            if (!string.IsNullOrEmpty(selFukuanyongtu))
+                Condition += " and  ok.[Fukuanyongtu] = '" + selFukuanyongtu + "'";
+
+            Query query = new Query();
+            IList<Criterion> criterias = new List<Criterion>()
+            {
+                new Criterion("", Condition),
+
+                new Criterion("orderBy"," CreateTime desc   ")
+            };
+            query.Criteria = criterias;
+            return _IOA_BaozhengjinDAL.SelectModelPage(query, pa);
+        }
+
+    }
+}
diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_BaozhengjincuishouBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_BaozhengjincuishouBLL.cs
new file mode 100644
index 0000000..384a3c4
--- /dev/null
+++ b/CY_ECommercePlatform/CY.BLL/OA/OA_BaozhengjincuishouBLL.cs
@@ -0,0 +1,141 @@
+锘�
+/**  
+* OA_BaozhengjincuishouBLL.cs
+*
+* 鍔� 鑳斤細 鍚堜綔瀹㈡埛涓氬姟閫昏緫绫�
+* 绫� 鍚嶏細 OA_BaozhengjincuishouBLL
+*
+* Ver    鍙樻洿鏃ユ湡             璐熻矗浜�  鍙樻洿鍐呭
+* 鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�
+* V0.01  2013-4-2 15:11       鍚磋緣      鍒濈増
+* V0.02  2013-5-29 17:43      鍚村磶鍧�    澧炲姞杞崲鍦ㄧ嚎浼氬憳涓哄巶鍟嗗鎴锋柟娉� 
+*
+*
+*
+*
+*
+*
+*/
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using CY.IDAL;
+using CY.Model;
+using AbstractFactory;
+using CY.IBaseDAL;
+using CY.Infrastructure.DESEncrypt;
+using CY.Infrastructure.Query;
+
+namespace CY.BLL
+{
+    public class OA_BaozhengjincuishouBLL
+    {
+        IOA_BaozhengjincuishouDAL _IOA_BaozhengjincuishouDAL = null;
+
+        /// <summary>
+        /// 鍒濆鍖栨瀯閫�
+        /// </summary>
+        /// </summary>
+        public OA_BaozhengjincuishouBLL()
+        {
+            //鑾峰彇OA_Baozhengjincuishou DAL瀹炵幇
+            _IOA_BaozhengjincuishouDAL = Factory.GetDALByInterfaceName(DALInterface.IOA_BaozhengjincuishouDAL) as IOA_BaozhengjincuishouDAL;
+
+
+        }
+
+        /// <summary>
+        /// 鏂板閫佽揣瀹夋帓
+        /// </summary>
+        /// <param name="rType"></param>
+        /// <param name="m_OA_CustomerCommunications"></param>
+        /// <param name="m_EC_AcceptWayByCustomers"></param>
+        /// <returns></returns>
+        public bool InsertModel(CY.Model.OA_Baozhengjincuishou m_OA_Baozhengjincuishou)
+        {
+            try
+            {
+
+                return _IOA_BaozhengjincuishouDAL.InserModel(m_OA_Baozhengjincuishou);
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+        /// <summary>
+        /// 淇敼閫佽揣瀹夋帓
+        /// </summary>
+        /// <param name="rType"></param>
+        /// <returns></returns>
+        public bool UpdateModel(CY.Model.OA_Baozhengjincuishou m_OA_Baozhengjincuishou)
+        {
+            try
+            {
+                return _IOA_BaozhengjincuishouDAL.UpdateModel(m_OA_Baozhengjincuishou);
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+        /// <summary>
+        /// 鑾峰彇鍏ㄩ儴鍚堜綔瀹㈡埛
+        /// </summary>
+        /// <param name="Keyid">涓婚敭id</param>
+        /// <returns></returns>
+        public IEnumerable<OA_Baozhengjincuishou> GetModelList()
+        {
+            Query query = new Query();
+            return _IOA_BaozhengjincuishouDAL.SelectAllModel(query);
+        }
+
+
+        /// <summary>
+        /// 鏍规嵁formid鑾峰緱淇℃伅
+        /// </summary>
+        /// <param name="BaozhengjinId">缂栧彿</param>
+        /// <returns></returns>
+        public IEnumerable<Model.OA_Baozhengjincuishou> GetModelByKaipiaoId(int BaozhengjinId)
+        {
+
+            return _IOA_BaozhengjincuishouDAL.GetModelByKaipiaoId(BaozhengjinId);
+        }
+
+        /// <summary>
+        /// 鑾峰彇鍏ㄩ儴鍚堜綔瀹㈡埛
+        /// </summary>
+        /// <param name="Keyid">涓婚敭id</param>
+        /// <returns></returns>
+        public OA_Baozhengjincuishou GetModelByKeyid(int keyid)
+        {
+
+            return _IOA_BaozhengjincuishouDAL.GetModelByKeyid(keyid);
+        }
+
+        /// <summary>
+        /// 鍒犻櫎鍚堜綔瀹㈡埛
+        /// </summary>
+        /// <param name="rType"></param>
+        /// <returns></returns>
+        public bool DeleteModel(CY.Model.OA_Baozhengjincuishou rType)
+        {
+            try
+            {
+                _IOA_BaozhengjincuishouDAL.DeleteModel(rType);
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+            return true;
+        }
+
+
+
+    }
+}
+
diff --git a/CY_ECommercePlatform/CY.IDAL/CY.IDAL.csproj b/CY_ECommercePlatform/CY.IDAL/CY.IDAL.csproj
index 6bcfa99..5e1aa21 100644
--- a/CY_ECommercePlatform/CY.IDAL/CY.IDAL.csproj
+++ b/CY_ECommercePlatform/CY.IDAL/CY.IDAL.csproj
@@ -158,6 +158,8 @@
     <Compile Include="Integrity\IIntegrity_IntegrityCardDAL.cs" />
     <Compile Include="OA\ICoreCmsPlanOrderDAL.cs" />
     <Compile Include="OA\ICoreCmsPlanOrderItemDAL.cs" />
+    <Compile Include="OA\IOA_BaozhengjincuishouDAL.cs" />
+    <Compile Include="OA\IOA_BaozhengjinDAL.cs" />
     <Compile Include="OA\IOA_CarrepairDAL.cs" />
     <Compile Include="OA\IOA_CuikuanjiluDAL.cs" />
     <Compile Include="OA\IOA_DeliverPlanDAL.cs" />
diff --git a/CY_ECommercePlatform/CY.IDAL/OA/IOA_BaozhengjinDAL.cs b/CY_ECommercePlatform/CY.IDAL/OA/IOA_BaozhengjinDAL.cs
new file mode 100644
index 0000000..e034f61
--- /dev/null
+++ b/CY_ECommercePlatform/CY.IDAL/OA/IOA_BaozhengjinDAL.cs
@@ -0,0 +1,32 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Data;
+using System.Data.SqlClient;
+using CY.IBaseDAL;
+using CY.Model;
+
+
+namespace CY.IDAL
+{
+    public interface IOA_BaozhengjinDAL : ICommonDAL, IPaging<OA_Baozhengjin>, IGetAllModel<OA_Baozhengjin>
+    {
+
+        /// <summary>
+        /// 鏍规嵁缂栧彿鑾峰緱淇℃伅
+        /// </summary>
+        /// <param name="Keyid">缂栧彿</param>
+        /// <returns></returns>
+        OA_Baozhengjin GetModelByKeyid(int keyid);
+
+        /// <summary>
+        /// 鏍规嵁formid鑾峰緱淇℃伅
+        /// </summary>
+        /// <param name="Keyid">缂栧彿</param>
+        /// <returns></returns>
+        IEnumerable<OA_Baozhengjin> GetModelByformid(Guid formid);
+
+
+    }
+}
diff --git a/CY_ECommercePlatform/CY.IDAL/OA/IOA_BaozhengjincuishouDAL.cs b/CY_ECommercePlatform/CY.IDAL/OA/IOA_BaozhengjincuishouDAL.cs
new file mode 100644
index 0000000..5f49823
--- /dev/null
+++ b/CY_ECommercePlatform/CY.IDAL/OA/IOA_BaozhengjincuishouDAL.cs
@@ -0,0 +1,29 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Data;
+using System.Data.SqlClient;
+using CY.IBaseDAL;
+using CY.Model;
+
+
+namespace CY.IDAL
+{
+    public interface IOA_BaozhengjincuishouDAL : ICommonDAL, IPaging<OA_Baozhengjincuishou>, IGetAllModel<OA_Baozhengjincuishou>
+    {
+        /// <summary>
+        /// 鏍规嵁缂栧彿鑾峰緱淇℃伅
+        /// </summary>
+        /// <param name="Keyid">缂栧彿</param>
+        /// <returns></returns>
+        OA_Baozhengjincuishou GetModelByKeyid(int keyid);
+
+        /// <summary>
+        /// 鏍规嵁KaipiaoId鑾峰緱淇℃伅
+        /// </summary>
+        /// <param name="BaozhengjinId">缂栧彿</param>
+        /// <returns></returns>
+        IEnumerable<OA_Baozhengjincuishou> GetModelByKaipiaoId(int BaozhengjinId);
+    }
+}
diff --git a/CY_ECommercePlatform/CY.Model/CY.Model.csproj b/CY_ECommercePlatform/CY.Model/CY.Model.csproj
index ea0e8ff..b4f0428 100644
--- a/CY_ECommercePlatform/CY.Model/CY.Model.csproj
+++ b/CY_ECommercePlatform/CY.Model/CY.Model.csproj
@@ -202,6 +202,8 @@
     <Compile Include="OA\CoreCmsPlanOrder.cs" />
     <Compile Include="OA\CoreCmsPlanOrderItem.cs" />
     <Compile Include="OA\CoreDeliverOrderItem.cs" />
+    <Compile Include="OA\OA_Baozhengjin.cs" />
+    <Compile Include="OA\OA_Baozhengjincuishou.cs" />
     <Compile Include="OA\OA_CarDictionary.cs" />
     <Compile Include="OA\OA_CarInsurance.cs" />
     <Compile Include="OA\OA_Carrepair.cs" />
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_Baozhengjin.cs b/CY_ECommercePlatform/CY.Model/OA/OA_Baozhengjin.cs
new file mode 100644
index 0000000..0e316ba
--- /dev/null
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_Baozhengjin.cs
@@ -0,0 +1,311 @@
+锘�/**  
+* OA_CorporateClients.cs
+*
+* 鍔� 鑳斤細 N/A
+* 绫� 鍚嶏細 OA_CorporateClients
+*
+* Ver    鍙樻洿鏃ユ湡             璐熻矗浜�  鍙樻洿鍐呭
+* 鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�
+* V0.01  2013-4-2 14:27:43   N/A    鍒濈増
+*
+*
+*
+*
+*
+*
+*/
+
+using System;
+using CY.Infrastructure.Domain;
+using CY.Infrastructure.Common;
+
+namespace CY.Model
+{
+    /// <summary>
+    /// 鍗板埛鍙傛暟
+    /// </summary>
+    [Serializable]
+    public partial class OA_Baozhengjin : IAggregateRoot
+    {
+
+        public OA_Baozhengjin()
+        {
+        }
+        #region Model
+        /// <summary>
+        /// id
+        /// </summary>
+        public int Keyid { get; set; }
+        /// <summary>
+        ///  FirmId
+        /// </summary>
+        public Guid FirmId { get; set; }
+
+
+        /// <summary>
+        /// FukuanTime
+        /// </summary>
+        public DateTime? FukuanTime
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// ReceiveWay
+        /// </summary>
+        public int? ReceiveWay { get; set; }
+
+        /// <summary>
+        /// Zhanghuleixing
+        /// </summary>
+        public string Zhanghuleixing { get; set; }
+
+        /// <summary>
+        /// ReceiveWay
+        /// </summary>
+        public int? Account { get; set; }
+
+        /// <summary>
+        /// Zhanghuleixing
+        /// </summary>
+        public string Fukuanzhanghu { get; set; }
+
+        /// <summary>
+        /// ReceiveWay
+        /// </summary>
+        public int? Subject { get; set; }
+
+        /// <summary>
+        /// Zhanghuleixing
+        /// </summary>
+        public string Fukuankemu { get; set; }
+
+        public decimal? Fukuanmoney { get; set; }
+
+        public string Shoukuandanwei { get; set; }
+
+        /// <summary>
+        /// 璇存槑
+        /// </summary>
+        public string remark { get; set; }
+
+        /// <summary>
+        /// TuikuanTime
+        /// </summary>
+        public DateTime? TuikuanTime
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// TuikuanStatus  2鏄�1鍚�
+        /// </summary>	
+        public int? TuikuanStatus { get; set; }
+
+
+
+        
+
+
+        public string TuikuanName
+        {
+            get
+            {
+                if (TuikuanStatus.HasValue && TuikuanStatus.Value == 2)
+                {
+                    return "宸查��娆�";
+                }
+                else
+                {
+                    return "鏈��娆�";
+                }
+            }
+        }
+
+     
+       
+
+ 
+        /// <summary>
+        /// 鍒涘缓浜�
+        /// </summary>
+        public string Creater
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 鍒涘缓鏃堕棿
+        /// </summary>
+        public DateTime? CreateTime
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 淇敼浜�
+        /// </summary>
+        public string Updater
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 淇敼鏃堕棿
+        /// </summary>
+        public DateTime? LastUpdateTime
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        ///  MemberId
+        /// </summary>
+        public int? MemberId { get; set; }
+
+        /// <summary>
+        ///  MemberName
+        /// </summary>
+        public string MemberName { get; set; }
+
+        #endregion Model
+
+        #region Visiter
+
+        /// <summary>
+        /// 灞炴�ц闂櫒
+        /// </summary>
+        /// <param name="name">灞炴�у悕</param>
+        /// <param name="index">绱㈠紩</param>
+        /// <param name="isChange">鏄惁灏嗘寚瀹氬睘鎬ц缃负浼犲叆鍊�</param>
+        /// <param name="value">闇�瑕佽祴浜堢殑鍊�</param>
+        /// <returns>涓庡悕绉板搴旂殑灞炴�у��</returns>
+        public object Visiter(string name, int? index = -1, bool isChange = false, object value = null)
+        {
+            object theValue = null;
+
+
+            if ("Keyid".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 1)
+            {
+                this.Keyid = isChange ? MyConvert.ConvertToInt32(value).Value : Keyid;
+                theValue = this.Keyid;
+            }
+            else if ("FirmId".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 2)
+            {
+                this.FirmId = isChange ? MyConvert.ConvertToGuid(value) : FirmId;
+                theValue = this.FirmId;
+            }
+            else if ("FukuanTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 3)
+            {
+                this.FukuanTime = isChange ? MyConvert.ConvertToDateTime(value) : FukuanTime;
+                theValue = this.FukuanTime;
+            }
+            else if ("ReceiveWay".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 4)
+            {
+                this.ReceiveWay = isChange ? MyConvert.ConvertToInt32(value) : ReceiveWay;
+                theValue = this.ReceiveWay;
+            }
+
+            else if ("Zhanghuleixing".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 5)
+            {
+                this.Zhanghuleixing = isChange ? MyConvert.ConvertToString(value) : Zhanghuleixing;
+                theValue = this.Zhanghuleixing;
+            }
+
+
+
+
+
+
+
+            else if ("Creater".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 14)
+            {
+                this.Creater = isChange ? MyConvert.ConvertToString(value) : Creater;
+                theValue = this.Creater;
+            }
+            else if ("CreateTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 15)
+            {
+                this.CreateTime = isChange ? MyConvert.ConvertToDateTime(value) : CreateTime;
+                theValue = this.CreateTime;
+            }
+            else if ("Updater".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 16)
+            {
+                this.Updater = isChange ? MyConvert.ConvertToString(value) : Updater;
+                theValue = this.Updater;
+            }
+            else if ("LastUpdateTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 17)
+            {
+                this.LastUpdateTime = isChange ? MyConvert.ConvertToDateTime(value) : LastUpdateTime;
+                theValue = this.LastUpdateTime;
+            }
+
+            else if ("Account".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 18)
+            {
+                this.Account = isChange ? MyConvert.ConvertToInt32(value) : Account;
+                theValue = this.Account;
+            }
+            else if ("Fukuanmoney".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 19)
+            {
+                this.Fukuanmoney = isChange ? MyConvert.ConvertToDecimal(value) : Fukuanmoney;
+                theValue = this.Fukuanmoney;
+            }
+            else if ("Fukuanzhanghu".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 20)
+            {
+                this.Fukuanzhanghu = isChange ? MyConvert.ConvertToString(value) : Fukuanzhanghu;
+                theValue = this.Fukuanzhanghu;
+            }
+            else if ("Subject".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 21)
+            {
+                this.Subject = isChange ? MyConvert.ConvertToInt32(value) : Subject;
+                theValue = this.Subject;
+            }
+            else if ("Fukuankemu".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 28)
+            {
+                this.Fukuankemu = isChange ? MyConvert.ConvertToString(value) : Fukuankemu;
+                theValue = this.Fukuankemu;
+            }
+
+            else if ("Shoukuandanwei".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 22)
+            {
+                this.Shoukuandanwei = isChange ? MyConvert.ConvertToString(value) : Shoukuandanwei;
+                theValue = this.Shoukuandanwei;
+            }
+            else if ("TuikuanTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 23)
+            {
+                this.TuikuanTime = isChange ? MyConvert.ConvertToDateTime(value) : TuikuanTime;
+                theValue = this.TuikuanTime;
+            }
+            else if ("TuikuanStatus".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 24)
+            {
+                this.TuikuanStatus = isChange ? MyConvert.ConvertToInt32(value) : TuikuanStatus;
+                theValue = this.TuikuanStatus;
+            }
+
+            
+            else if ("remark".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 26)
+            {
+                this.remark = isChange ? MyConvert.ConvertToString(value) : remark;
+                theValue = this.remark;
+            }
+
+            else if ("MemberId".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 27)
+            {
+                this.MemberId = isChange ? MyConvert.ConvertToInt32(value) : MemberId;
+                theValue = this.MemberId;
+            }
+            else if ("MemberName".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 28)
+            {
+                this.MemberName = isChange ? MyConvert.ConvertToString(value) : MemberName;
+                theValue = this.MemberName;
+            }
+            
+            return theValue;
+        }
+
+        #endregion
+    }
+}
+ 
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_Baozhengjincuishou.cs b/CY_ECommercePlatform/CY.Model/OA/OA_Baozhengjincuishou.cs
new file mode 100644
index 0000000..70ddaa1
--- /dev/null
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_Baozhengjincuishou.cs
@@ -0,0 +1,138 @@
+锘�/**  
+*OA_CorporateClients.cs
+*
+*鍔� 鑳斤細 N / A
+* 绫� 鍚嶏細 OA_CorporateClients
+*
+* Ver    鍙樻洿鏃ユ湡             璐熻矗浜�  鍙樻洿鍐呭
+* 鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�
+* V0.01  2013-4-2 14:27:43   N / A    鍒濈増
+  *
+  *
+  *
+  *
+  *
+  *
+  */
+
+using System;
+using CY.Infrastructure.Domain;
+using CY.Infrastructure.Common;
+
+namespace CY.Model
+{
+    /// <summary>
+    /// 鍗板埛鍙傛暟
+    /// </summary>
+    [Serializable]
+    public partial class OA_Baozhengjincuishou : IAggregateRoot
+    {
+        #region Model
+        /// <summary>
+        /// Keyid
+        /// </summary>
+        public int Keyid { get; set; }
+        /// <summary>
+        ///  BaozhengjinId
+        /// </summary>
+        public int BaozhengjinId { get; set; }
+
+
+
+        /// <summary>
+        /// 鍒涘缓浜�
+        /// </summary>
+        public string Creater
+        {
+            get;
+            set;
+        }
+
+
+        /// <summary>
+        /// 鍌敹鎯呭喌
+        /// </summary>
+        public string Cuikuanqingkuang
+        {
+            get;
+            set;
+        }
+
+
+        /// <summary>
+        /// 鍒涘缓鏃堕棿
+        /// </summary>
+        public DateTime? CreateTime
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 鍒涘缓鏃堕棿
+        /// </summary>
+        public DateTime? CuishouTime
+        {
+            get;
+            set;
+        }
+
+        #endregion Model
+
+        #region Visiter
+
+        /// <summary>
+        /// 灞炴�ц闂櫒
+        /// </summary>
+        /// <param name="name">灞炴�у悕</param>
+        /// <param name="index">绱㈠紩</param>
+        /// <param name="isChange">鏄惁灏嗘寚瀹氬睘鎬ц缃负浼犲叆鍊�</param>
+        /// <param name="value">闇�瑕佽祴浜堢殑鍊�</param>
+        /// <returns>涓庡悕绉板搴旂殑灞炴�у��</returns>
+        public object Visiter(string name, int? index = -1, bool isChange = false, object value = null)
+        {
+            object theValue = null;
+
+
+            if ("Keyid".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 1)
+            {
+                this.Keyid = isChange ? MyConvert.ConvertToInt32(value).Value : Keyid;
+                theValue = this.Keyid;
+            }
+            else if ("BaozhengjinId".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 2)
+            {
+                this.BaozhengjinId = isChange ? MyConvert.ConvertToInt32(value).Value : BaozhengjinId;
+                theValue = this.BaozhengjinId;
+            }
+
+
+
+
+            else if ("Creater".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 3)
+            {
+                this.Creater = isChange ? MyConvert.ConvertToString(value) : Creater;
+                theValue = this.Creater;
+            }
+            else if ("CreateTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 4)
+            {
+                this.CreateTime = isChange ? MyConvert.ConvertToDateTime(value) : CreateTime;
+                theValue = this.CreateTime;
+            }
+            else if ("CuishouTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 5)
+            {
+                this.CuishouTime = isChange ? MyConvert.ConvertToDateTime(value) : CuishouTime;
+                theValue = this.CuishouTime;
+            }
+            else if ("Cuikuanqingkuang".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 6)
+            {
+                this.Cuikuanqingkuang = isChange ? MyConvert.ConvertToString(value) : Cuikuanqingkuang;
+                theValue = this.Cuikuanqingkuang;
+            }
+
+
+            return theValue;
+        }
+
+        #endregion
+    }
+}
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_Kaipiaonewcuishou.cs b/CY_ECommercePlatform/CY.Model/OA/OA_Kaipiaonewcuishou.cs
index 659abb8..6582672 100644
--- a/CY_ECommercePlatform/CY.Model/OA/OA_Kaipiaonewcuishou.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_Kaipiaonewcuishou.cs
@@ -99,7 +99,7 @@
                 this.Keyid = isChange ? MyConvert.ConvertToInt32(value).Value : Keyid;
                 theValue = this.Keyid;
             }
-            else if ("FirmId".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 2)
+            else if ("KaipiaoId".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 2)
             {
                 this.KaipiaoId = isChange ? MyConvert.ConvertToGuid(value) : KaipiaoId;
                 theValue = this.KaipiaoId;
diff --git a/CY_ECommercePlatform/CY.SQLDAL/CY.SQLDAL.csproj b/CY_ECommercePlatform/CY.SQLDAL/CY.SQLDAL.csproj
index 0847b49..0c0f5f8 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/CY.SQLDAL.csproj
+++ b/CY_ECommercePlatform/CY.SQLDAL/CY.SQLDAL.csproj
@@ -171,6 +171,8 @@
     <Compile Include="LF\LF_SellerFileSpaceDAL.cs" />
     <Compile Include="OA\CoreCmsPlanOrderDAL.cs" />
     <Compile Include="OA\CoreCmsPlanOrderItemDAL.cs" />
+    <Compile Include="OA\OA_BaozhengjincuishouDAL.cs" />
+    <Compile Include="OA\OA_BaozhengjinDAL.cs" />
     <Compile Include="OA\OA_CarDictionaryDAL.cs" />
     <Compile Include="OA\OA_CarExaminedDAL.cs" />
     <Compile Include="OA\OA_CarInsuranceDAL.cs" />
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_BaozhengjinDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_BaozhengjinDAL.cs
new file mode 100644
index 0000000..c1cfb90
--- /dev/null
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_BaozhengjinDAL.cs
@@ -0,0 +1,285 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using CY.IDAL;
+using System.Data.SqlClient;
+using System.Data;
+using CY.Model;
+using System.Transactions;
+
+
+namespace CY.SQLDAL
+{
+    public class OA_BaozhengjinDAL : IOA_BaozhengjinDAL
+    {
+
+        private Database _dataBase = null;
+        #region 甯搁噺
+        /// <summary>
+        /// 鏌ヨ鐩爣 
+        /// </summary>
+        const string SELECTTARGET = " t.* ";
+        /// <summary>
+        /// 鏌ヨ鏉ユ簮
+        /// </summary>
+        const string FROMSOUCEBEFORE = " ( select distinct ok.* " +
+          //"     oe.Name as SupplierName   " +
+          " from [OA_Baozhengjin] ok  " +
+
+
+        "   where 0=0  ";
+        const string FROMSOUCEEND = ") as t  ";
+        /// <summary>
+        /// 鍒嗛〉榛樿鎺掑簭瀛楁
+        /// </summary>
+        const string ORDERBY = " CreateTime desc  ";
+        #endregion
+        public OA_BaozhengjinDAL()
+        {
+            _dataBase = new Database();
+        }
+
+
+        /// <summary>
+        /// 鏂板
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool InserModel(Infrastructure.Domain.IAggregateRoot model)
+        {
+            Model.OA_Baozhengjin trueModel = model as Model.OA_Baozhengjin;
+            if (trueModel == null)
+            {
+                return false;
+            }
+            SqlParameter TuikuanTime = null;
+            if (trueModel.TuikuanTime.HasValue)
+            {
+                TuikuanTime = new SqlParameter("@TuikuanTime", trueModel.TuikuanTime.Value);
+            }
+            else
+            {
+                TuikuanTime = new SqlParameter("@TuikuanTime", DBNull.Value);
+            }
+
+
+            IList<SqlParameter> sqlParms = new List<SqlParameter>()
+            {
+
+                 
+                    new SqlParameter("@FirmId",trueModel.FirmId),
+                    new SqlParameter("@FukuanTime",trueModel.FukuanTime),
+                     new SqlParameter("@ReceiveWay",trueModel.ReceiveWay.HasValue?trueModel.ReceiveWay.Value:0),
+                      new SqlParameter("@Zhanghuleixing",trueModel.Zhanghuleixing),
+                      new SqlParameter("@Account",trueModel.Account.HasValue?trueModel.Account.Value:0),
+                      new SqlParameter("@Fukuanzhanghu",trueModel.Fukuanzhanghu),
+                      new SqlParameter("@Subject",trueModel.Subject.HasValue?trueModel.Subject.Value:0),
+                      new SqlParameter("@Fukuankemu",trueModel.Fukuankemu),
+                       new SqlParameter("@Fukuanmoney",trueModel.Fukuanmoney.HasValue?trueModel.Fukuanmoney.Value:0),
+                        new SqlParameter("@Shoukuandanwei",trueModel.Shoukuandanwei),
+                          new SqlParameter("@remark",string.IsNullOrEmpty(trueModel.remark)?"":trueModel.remark),
+                          TuikuanTime,
+                           new SqlParameter("@TuikuanStatus",trueModel.TuikuanStatus.HasValue?trueModel.TuikuanStatus.Value:0),
+
+                            new SqlParameter("@Creater",trueModel.Creater),
+                              new SqlParameter("@CreateTime",trueModel.CreateTime),
+
+                                new SqlParameter("@Updater",trueModel.Updater),
+                                  new SqlParameter("@LastUpdateTime",trueModel.LastUpdateTime),
+                                   new SqlParameter("@MemberId",trueModel.MemberId.HasValue?trueModel.MemberId.Value:0 ),
+                                    new SqlParameter("@MemberName",trueModel.MemberName),
+
+
+
+
+
+            };
+            string sql = "Insert Into OA_Baozhengjin ([FirmId],[FukuanTime],[ReceiveWay],[Zhanghuleixing], [Account], [Fukuanzhanghu],[Subject], [Fukuankemu],[Fukuanmoney], [Creater],[CreateTime],[Updater],[LastUpdateTime],[Shoukuandanwei],remark,TuikuanStatus,TuikuanTime,MemberId,MemberName)"
+                                             + " Values (@FirmId,@FukuanTime,@ReceiveWay, @Zhanghuleixing, @Account, @Fukuanzhanghu, @Subject, @Fukuankemu, @Fukuanmoney, @Creater,@CreateTime,@Updater,@LastUpdateTime,@Shoukuandanwei,@remark,@TuikuanStatus,@TuikuanTime,@MemberId,@MemberName )";
+
+            try
+            {
+                _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+            return true;
+        }
+
+       
+
+        /// <summary>
+        /// 淇敼
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool UpdateModel(Infrastructure.Domain.IAggregateRoot model)
+        {
+            Model.OA_Baozhengjin trueModel = model as Model.OA_Baozhengjin;
+            if (trueModel == null)
+            {
+                return false;
+            }
+            SqlParameter TuikuanTime = null;
+            if (trueModel.TuikuanTime.HasValue)
+            {
+                TuikuanTime = new SqlParameter("@TuikuanTime", trueModel.TuikuanTime.Value);
+            }
+            else
+            {
+                TuikuanTime = new SqlParameter("@TuikuanTime", DBNull.Value);
+            }
+
+
+            IList<SqlParameter> sqlParms = new List<SqlParameter>()
+            {
+
+                new SqlParameter("@Keyid",trueModel.Keyid),
+                    new SqlParameter("@FirmId",trueModel.FirmId),
+                    new SqlParameter("@FukuanTime",trueModel.FukuanTime),
+                     new SqlParameter("@ReceiveWay",trueModel.ReceiveWay.HasValue?trueModel.ReceiveWay.Value:0),
+                      new SqlParameter("@Zhanghuleixing",trueModel.Zhanghuleixing),
+                      new SqlParameter("@Account",trueModel.Account.HasValue?trueModel.Account.Value:0),
+                      new SqlParameter("@Fukuanzhanghu",trueModel.Fukuanzhanghu),
+                      new SqlParameter("@Subject",trueModel.Subject.HasValue?trueModel.Subject.Value:0),
+                      new SqlParameter("@Fukuankemu",trueModel.Fukuankemu),
+                       new SqlParameter("@Fukuanmoney",trueModel.Fukuanmoney.HasValue?trueModel.Fukuanmoney.Value:0),
+                        new SqlParameter("@Shoukuandanwei",trueModel.Shoukuandanwei),
+                          new SqlParameter("@remark",string.IsNullOrEmpty(trueModel.remark)?"":trueModel.remark),
+                          TuikuanTime,
+                           new SqlParameter("@TuikuanStatus",trueModel.TuikuanStatus.HasValue?trueModel.TuikuanStatus.Value:0),
+
+                            new SqlParameter("@Creater",trueModel.Creater),
+                              new SqlParameter("@CreateTime",trueModel.CreateTime),
+
+                                new SqlParameter("@Updater",trueModel.Updater),
+                                  new SqlParameter("@LastUpdateTime",trueModel.LastUpdateTime),
+                                     new SqlParameter("@MemberId",trueModel.MemberId.HasValue?trueModel.MemberId.Value:0 ),
+                                      new SqlParameter("@MemberName",trueModel.MemberName),
+            };
+            string sql = "Update OA_Baozhengjin Set [FirmId]=@FirmId,[FukuanTime]=@FukuanTime,[ReceiveWay]=@ReceiveWay,[Zhanghuleixing]=@Zhanghuleixing, [Account]=@Account, [Fukuanzhanghu]=@Fukuanzhanghu,[Subject]=@Subject, [Fukuankemu]=@Fukuankemu,[Fukuanmoney]=@Fukuanmoney, [Creater]=@Creater,[CreateTime]=@CreateTime,[Updater]=@Updater,[LastUpdateTime]=@LastUpdateTime,Shoukuandanwei=@Shoukuandanwei,remark=@remark,TuikuanTime=@TuikuanTime,TuikuanStatus=@TuikuanStatus,MemberId=@MemberId,MemberName=@MemberName  where [Keyid] =@Keyid ";
+
+            try
+            {
+                _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+            return true;
+        }
+
+        /// <summary>
+        /// 鏍规嵁缂栧彿鑾峰緱淇℃伅
+        /// </summary>
+        /// <param name="Keyid">缂栧彿</param>
+        /// <returns></returns>
+        public OA_Baozhengjin GetModelByKeyid(int keyid)
+        {
+            try
+            {
+                string condition = "  ";
+                if (keyid > 0)
+                {
+                    condition = " Keyid=" + keyid + "";
+                }
+                else
+                {
+                    return null;
+                }
+
+                //  return null;//閿欒鏁版嵁杩斾細绌� 
+
+                IList<OA_Baozhengjin> result = _dataBase.SelectModel<OA_Baozhengjin>("*", "OA_Baozhengjin", condition) as IList<OA_Baozhengjin>;//鎵ц鏌ヨ
+
+                return (null == result || result.Count == 0) ? null : result[0];//杩斿洖缁撴灉
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+
+        /// <summary>
+        /// 鍏ㄩ儴鏌ヨ
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public IEnumerable<Model.OA_Baozhengjin> SelectAllModel(Infrastructure.Query.Query query)
+        {
+            return _dataBase.SelectModel<Model.OA_Baozhengjin>(" * ", " OA_Baozhengjin ") as IList<Model.OA_Baozhengjin>;//鎵ц鏌ヨ
+        }
+
+        /// <summary>
+        /// 鍏ㄩ儴鏌ヨ
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public IEnumerable<Model.OA_Baozhengjin> GetModelByformid(Guid FirmId)
+        {
+            return _dataBase.SelectModel<Model.OA_Baozhengjin>(" * ", " OA_Baozhengjin ", " FirmId = '" + FirmId + "'") as IList<Model.OA_Baozhengjin>;//鎵ц鏌ヨ
+        }
+
+
+        /// <summary>
+        /// 鍒嗛〉鏌ヨ
+        /// </summary>
+        /// <param name="query"></param>
+        /// <param name="pagination"></param>
+        /// <returns></returns>
+        public IEnumerable<Model.OA_Baozhengjin> SelectModelPage(Infrastructure.Query.Query query, Infrastructure.Query.Pagination pagination)
+        {
+            if (null == pagination || null == query || null == query.Criteria || 1 > query.Criteria.Count)
+                return null;
+            //query.Criteria 棣栦釜鍏冪礌蹇呴』鏄帓搴忓瓧娈碉紝鍏跺�间负缁撴灉鎺掑簭瀛楁
+
+            int maxParamIndex = query.Criteria.Count - 1;//鏈�澶х储寮�
+
+            string[] orderbys = new string[] { ORDERBY };
+            string resultOrderBy = "";//缁撴灉闆嗘帓搴忔柟寮�
+
+            if ("@orderBy".Equals(query.Criteria[maxParamIndex].PropertyName))
+            {
+                orderbys = string.Format("{0}", query.Criteria[maxParamIndex].Value).Split(',');
+                resultOrderBy = query.Criteria[maxParamIndex].Value.ToString();//= 1 == orderbys.Length ? resultOrderBy : orderbys[1];
+            }
+            string fromSouce = string.Format("{0}{1}{2}", FROMSOUCEBEFORE, query.Criteria[0].Value, FROMSOUCEEND);//鎷艰鏉′欢
+            return _dataBase.SelectModelPage<Model.OA_Baozhengjin>(pagination, SELECTTARGET, fromSouce, orderbys[0], resultOrderBy);
+        }
+
+        /// <summary>
+        /// 鍒犻櫎
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool DeleteModel(Infrastructure.Domain.IAggregateRoot model)
+        {
+            Model.OA_Baozhengjin trueModel = model as Model.OA_Baozhengjin;
+            if (trueModel == null)
+            {
+                return false;
+            }
+            IList<SqlParameter> sqlParms = new List<SqlParameter>()
+            {
+                new SqlParameter("@Keyid",trueModel.Keyid)
+            };
+            string sql = "Delete OA_Baozhengjin Where [Keyid] = @Keyid ";
+
+
+            try
+            {
+                _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+            return true;
+        }
+    }
+}
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_BaozhengjincuishouDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_BaozhengjincuishouDAL.cs
new file mode 100644
index 0000000..fa73798
--- /dev/null
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_BaozhengjincuishouDAL.cs
@@ -0,0 +1,234 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using CY.IDAL;
+using System.Data.SqlClient;
+using System.Data;
+using CY.Model;
+using System.Transactions;
+
+
+namespace CY.SQLDAL
+{
+    public class OA_BaozhengjincuishouDAL : IOA_BaozhengjincuishouDAL
+    {
+        private Database _dataBase = null;
+        #region 甯搁噺
+        /// <summary>
+        /// 鏌ヨ鐩爣 
+        /// </summary>
+        const string SELECTTARGET = " t.* ";
+        /// <summary>
+        /// 鏌ヨ鏉ユ簮
+        /// </summary>
+        const string FROMSOUCEBEFORE = " ( select distinct ok.*,d_kaipiaoshenqing.Name as KaipiaoshenqingName,d_fapiaoqianshou.Name as KehuqianshouName, " +
+             "     oe.CompanyName as BuyerName,eo.shuliang,eo.jine, os.Name as BusinessManager  " +
+          " from [OA_Baozhengjincuishou] ok inner join  [OA_CorporateClients] oe  on oe.Keyid = ok.[BuyerId] " +
+
+             " left join (select  count(*) as shuliang,sum(eo.[SumPrice]) as jine,eoe.KaipiaoshenqingId  from  [EC_OrderBasic] eo  ,[EC_OrderExtend] eoe  where eoe.Keyid=eo.Keyid group by eoe.KaipiaoshenqingId  )   eo on ok.Keyid =eo.KaipiaoshenqingId " +
+        " left join [OA_Staff] os on ok.BusinessManagerId = os.Keyid " +
+
+        " Left Join Sys_Dictionary as d_kaipiaoshenqing On(d_kaipiaoshenqing.DicType= 'EC_寮�绁ㄧ敵璇�' and ok.[Kaipiaoshenqing]= d_kaipiaoshenqing.MeanValue)    " +
+        " Left Join Sys_Dictionary as d_fapiaoqianshou On(d_fapiaoqianshou.DicType= 'EC_鍙戠エ绛炬敹' and ok.[Kehuqianshou]= d_fapiaoqianshou.MeanValue)  where 0=0  ";
+        const string FROMSOUCEEND = ") as t  ";
+        /// <summary>
+        /// 鍒嗛〉榛樿鎺掑簭瀛楁
+        /// </summary>
+        const string ORDERBY = " SellerOrderId desc  ";
+        #endregion
+
+        public OA_BaozhengjincuishouDAL()
+        {
+            _dataBase = new Database();
+        }
+
+        /// <summary>
+        /// 鏂板
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool InserModel(Infrastructure.Domain.IAggregateRoot model)
+        {
+            Model.OA_Baozhengjincuishou trueModel = model as Model.OA_Baozhengjincuishou;
+            if (trueModel == null)
+            {
+                return false;
+            }
+
+
+            IList<SqlParameter> sqlParms = new List<SqlParameter>()
+            {
+
+
+                    new SqlParameter("@BaozhengjinId",trueModel.BaozhengjinId),
+
+                              new SqlParameter("@CreateTime",trueModel.CreateTime),
+
+   new SqlParameter("@CuishouTime",trueModel.CuishouTime),
+                                    new SqlParameter("@Creater",trueModel.Creater),
+ new SqlParameter("@Cuikuanqingkuang",string.IsNullOrWhiteSpace(trueModel.Cuikuanqingkuang)?"":trueModel.Cuikuanqingkuang),
+
+            };
+            string sql = "Insert Into OA_Baozhengjincuishou ( [BaozhengjinId] , [Creater],[CreateTime],[CuishouTime],[Cuikuanqingkuang] )"
+                                             + " Values (  @BaozhengjinId,  @Creater,@CreateTime,@CuishouTime,@Cuikuanqingkuang  )";
+            try
+            {
+                _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+            return true;
+        }
+
+        /// <summary>
+        /// 淇敼
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool UpdateModel(Infrastructure.Domain.IAggregateRoot model)
+        {
+            Model.OA_Baozhengjincuishou trueModel = model as Model.OA_Baozhengjincuishou;
+            if (trueModel == null)
+            {
+                return false;
+            }
+
+
+            IList<SqlParameter> sqlParms = new List<SqlParameter>()
+            {
+
+                  new SqlParameter("@Keyid",trueModel.Keyid),
+
+
+                              new SqlParameter("@CreateTime",trueModel.CreateTime),
+
+   new SqlParameter("@CuishouTime",trueModel.CuishouTime),
+                                    new SqlParameter("@Creater",trueModel.Creater),
+                                     new SqlParameter("@Cuikuanqingkuang",string.IsNullOrWhiteSpace(trueModel.Cuikuanqingkuang)?"":trueModel.Cuikuanqingkuang),
+            };
+            string sql = "Update OA_Baozhengjincuishou Set   [Creater]=@Creater,[CreateTime]=@CreateTime,[CuishouTime]=@CuishouTime,[Cuikuanqingkuang]=@Cuikuanqingkuang  where [Keyid] =@Keyid ";
+
+            try
+            {
+                _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+            return true;
+        }
+
+        /// <summary>
+        /// 鏍规嵁缂栧彿鑾峰緱淇℃伅
+        /// </summary>
+        /// <param name="Keyid">缂栧彿</param>
+        /// <returns></returns>
+        public OA_Baozhengjincuishou GetModelByKeyid(int keyid)
+        {
+            try
+            {
+                string condition = "  ";
+                if (keyid > 0)
+                {
+                    condition = " Keyid=" + keyid + "";
+                }
+                else
+                {
+                    return null;
+                }
+
+                //  return null;//閿欒鏁版嵁杩斾細绌� 
+
+                IList<OA_Baozhengjincuishou> result = _dataBase.SelectModel<OA_Baozhengjincuishou>("*", "OA_Baozhengjincuishou", condition) as IList<OA_Baozhengjincuishou>;//鎵ц鏌ヨ
+
+                return (null == result || result.Count == 0) ? null : result[0];//杩斿洖缁撴灉
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+
+        /// <summary>
+        /// 鍏ㄩ儴鏌ヨ
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public IEnumerable<Model.OA_Baozhengjincuishou> SelectAllModel(Infrastructure.Query.Query query)
+        {
+            return _dataBase.SelectModel<Model.OA_Baozhengjincuishou>(" * ", " OA_Baozhengjincuishou ") as IList<Model.OA_Baozhengjincuishou>;//鎵ц鏌ヨ
+        }
+
+        /// <summary>
+        /// 鍏ㄩ儴鏌ヨ
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public IEnumerable<Model.OA_Baozhengjincuishou> GetModelByKaipiaoId(int BaozhengjinId)
+        {
+            return _dataBase.SelectModel<Model.OA_Baozhengjincuishou>(" * ", " OA_Baozhengjincuishou ", " BaozhengjinId = '" + BaozhengjinId + "' order by CreateTime desc ") as IList<Model.OA_Baozhengjincuishou>;//鎵ц鏌ヨ
+        }
+
+
+        /// <summary>
+        /// 鍒嗛〉鏌ヨ
+        /// </summary>
+        /// <param name="query"></param>
+        /// <param name="pagination"></param>
+        /// <returns></returns>
+        public IEnumerable<Model.OA_Baozhengjincuishou> SelectModelPage(Infrastructure.Query.Query query, Infrastructure.Query.Pagination pagination)
+        {
+            if (null == pagination || null == query || null == query.Criteria || 1 > query.Criteria.Count)
+                return null;
+            //query.Criteria 棣栦釜鍏冪礌蹇呴』鏄帓搴忓瓧娈碉紝鍏跺�间负缁撴灉鎺掑簭瀛楁
+
+            int maxParamIndex = query.Criteria.Count - 1;//鏈�澶х储寮�
+
+            string[] orderbys = new string[] { ORDERBY };
+            string resultOrderBy = "";//缁撴灉闆嗘帓搴忔柟寮�
+
+            if ("@orderBy".Equals(query.Criteria[maxParamIndex].PropertyName))
+            {
+                orderbys = string.Format("{0}", query.Criteria[maxParamIndex].Value).Split(',');
+                resultOrderBy = query.Criteria[maxParamIndex].Value.ToString();//= 1 == orderbys.Length ? resultOrderBy : orderbys[1];
+            }
+            string fromSouce = string.Format("{0}{1}{2}", FROMSOUCEBEFORE, query.Criteria[0].Value, FROMSOUCEEND);//鎷艰鏉′欢
+            return _dataBase.SelectModelPage<Model.OA_Baozhengjincuishou>(pagination, SELECTTARGET, fromSouce, orderbys[0], resultOrderBy);
+        }
+
+        /// <summary>
+        /// 鍒犻櫎
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool DeleteModel(Infrastructure.Domain.IAggregateRoot model)
+        {
+            Model.OA_Baozhengjincuishou trueModel = model as Model.OA_Baozhengjincuishou;
+            if (trueModel == null)
+            {
+                return false;
+            }
+            IList<SqlParameter> sqlParms = new List<SqlParameter>()
+            {
+                new SqlParameter("@Keyid",trueModel.Keyid)
+            };
+            string sql = "Delete OA_Baozhengjincuishou Where [Keyid] = @Keyid ";
+
+
+            try
+            {
+                _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+            return true;
+        }
+    }
+}
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ProcurementDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ProcurementDAL.cs
index e4d3e5a..45cc514 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ProcurementDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ProcurementDAL.cs
@@ -91,11 +91,21 @@
             {
                 return false;
             }
+
+            SqlParameter SuppliersId = null;
+            if (trueModel.SuppliersId.HasValue)
+            {
+                SuppliersId = new SqlParameter("@SuppliersId", trueModel.SuppliersId);
+            }
+            else
+            {
+                SuppliersId = new SqlParameter("@SuppliersId", DBNull.Value);
+            }
             IList<SqlParameter> sqlParms = new List<SqlParameter>()
             { 
                     new SqlParameter("@Keyid",trueModel.Keyid),
                     new SqlParameter("@FirmId",trueModel.FirmId),
-					new SqlParameter("@SuppliersId",trueModel.SuppliersId),
+                    SuppliersId,
 					new SqlParameter("@GoodsId",trueModel.GoodsId),
 					new SqlParameter("@ClearingStatusId",trueModel.ClearingStatusId),
 					new SqlParameter("@Price",trueModel.Price),
diff --git a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
index 0c874d2..3f5652f 100644
--- a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
+++ b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
@@ -1884,6 +1884,8 @@
     <Content Include="Pages\business\BargainPrice.aspx" />
     <Content Include="Pages\business\BargainPriceByFirm.aspx" />
     <Content Include="Pages\business\Caigoufukuanshenqing.aspx" />
+    <Content Include="Pages\business\Baozhengjinfukuan.aspx" />
+    <Content Include="Pages\business\BaozhengjinCuishou.aspx" />
     <Content Include="Pages\business\WaixieOrderPrint.aspx" />
     <Content Include="Pages\business\Waixiefukuanweikaipiao.aspx" />
     <Content Include="Pages\business\Waixiefukuanfukuan.aspx" />
@@ -2044,6 +2046,7 @@
     <Content Include="Pages\common\U_Login.ascx" />
     <Content Include="Pages\financial\DepositsCustomershouruqueren.aspx" />
     <Content Include="Pages\financial\DepositsCustomerFapiao.aspx" />
+    <Content Include="Pages\financial\BaozhengjinIncome.aspx" />
     <Content Include="Pages\financial\NewWaixieExpenses.aspx" />
     <Content Include="Pages\financial\OutsourcePiliangPayMoney.aspx" />
     <Content Include="Pages\financial\CaigouPayEdit.aspx" />
@@ -3313,6 +3316,20 @@
     <Compile Include="Pages\business\Caigoufukuanshenqing.aspx.designer.cs">
       <DependentUpon>Caigoufukuanshenqing.aspx</DependentUpon>
     </Compile>
+    <Compile Include="Pages\business\Baozhengjinfukuan.aspx.cs">
+      <DependentUpon>Baozhengjinfukuan.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Pages\business\Baozhengjinfukuan.aspx.designer.cs">
+      <DependentUpon>Baozhengjinfukuan.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="Pages\business\BaozhengjinCuishou.aspx.cs">
+      <DependentUpon>BaozhengjinCuishou.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Pages\business\BaozhengjinCuishou.aspx.designer.cs">
+      <DependentUpon>BaozhengjinCuishou.aspx</DependentUpon>
+    </Compile>
     <Compile Include="Pages\business\WaixieOrderPrint.aspx.cs">
       <DependentUpon>WaixieOrderPrint.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -4433,6 +4450,13 @@
     <Compile Include="Pages\financial\DepositsCustomerFapiao.aspx.designer.cs">
       <DependentUpon>DepositsCustomerFapiao.aspx</DependentUpon>
     </Compile>
+    <Compile Include="Pages\financial\BaozhengjinIncome.aspx.cs">
+      <DependentUpon>BaozhengjinIncome.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Pages\financial\BaozhengjinIncome.aspx.designer.cs">
+      <DependentUpon>BaozhengjinIncome.aspx</DependentUpon>
+    </Compile>
     <Compile Include="Pages\financial\NewWaixieExpenses.aspx.cs">
       <DependentUpon>NewWaixieExpenses.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/BaozhengjinCuishou.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/BaozhengjinCuishou.aspx
new file mode 100644
index 0000000..279db41
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/BaozhengjinCuishou.aspx
@@ -0,0 +1,112 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="BaozhengjinCuishou.aspx.cs" Inherits="CY.WebForm.Pages.business.BaozhengjinCuishou" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <title>璁㈠崟鏀舵</title>
+    <uc:CMSHead ID="CMSHead1" runat="server" />
+    <link href="../../Styles/ParticularWQJ.css" rel="stylesheet" type="text/css" />
+    <script type="text/javascript">
+       
+    </script>
+</head>
+<body style='margin: 0; padding: 0;'>
+    <form id="form1" runat="server" onsubmit="if(false)return false;">
+    
+        <table class="table2" width="100%">
+    
+      
+    
+    <tr>
+        <td   class='col_third' '>
+            浠樻鍗曚綅锛� 
+            <label runat="server" id="txtBuyerName"></label>
+           
+        </td>
+    </tr>
+              
+             <tr>
+    
+                   <td  class='col_third'  >
+           閲戦锛� 
+            <label runat="server" id="txtjine"></label>
+           
+        </td>
+    </tr>
+            <tr >
+                    <td  class="contentLeft" colspan='2' >鍌鏃堕棿锛� <input type="text" id="txtStartTime" runat="server" class="date w150px" datefmt="yyyy-MM-dd HH:mm"  /></td>
+                    
+                </tr>
+             <tr >
+                  <td   class="contentLeft" colspan='2'> 鍌鎯呭喌锛� </td>
+                    
+                </tr>
+             <tr >
+                 
+                    <td  class="contentLeft" colspan='2'  >  <textarea id="txtCuikuanqingkuang" runat="server" maxlength="250"  style=" width:570px; height:120px;"></textarea></td>
+                    
+                </tr>
+
+
+     <tr>
+        <td class="contentLeft" colspan='2'>
+            &#12288;&#12288;&#12288;&#12288;&#12288;<input type="button" value="纭" runat="server"  id='btnSubmit' />
+            <input type="hidden"  id="ids" runat="server"  />
+        </td>
+    </tr>
+    </table>
+
+             <table class="tableStyle tableStyleXS" useclick="false" usecheckbox="true" sortmode="false" id="test_table">
+                <thead>
+                    <tr>
+                        <th width="25">
+                            缂栧彿
+                        </th>
+                          <th style="text-align: center;" width="70">
+                           鍌鏃堕棿
+                        </th>
+                         <th style="text-align: center;" width="200">
+                           鍌敹鎯呭喌
+                        </th>
+                           <th style="text-align: center;" width="70">
+                           鍌浜�
+                        </th>
+                        
+                        
+                       
+                      
+                    </tr>
+                </thead>
+                <tbody>
+                    <asp:repeater id="rptData" runat="server">
+                        <itemtemplate>
+                            <tr>
+                                 
+                               <td>
+                                    <%#Container.ItemIndex +1 /*(UCPager1.PageSize *( UCPager1.PageIndex-1)+1)*/%>
+                                </td>
+                                <td>
+                                   <%#Eval("CreateTime", "{0:MM-dd HH:mm}")%>
+                                     
+                                </td>
+                                 <td style="text-align: center;">
+                                        <%#Eval("Cuikuanqingkuang")%>
+
+                                   
+                                </td>
+                                 <td style="text-align: center;">
+                                        <%#Eval("Creater")%>
+
+                                   
+                                </td>
+                                
+                                 
+                                 
+                            </tr>
+                        </itemtemplate>
+                    </asp:repeater>
+                </tbody>
+            </table>
+    </form>
+</body>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/BaozhengjinCuishou.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/BaozhengjinCuishou.aspx.cs
new file mode 100644
index 0000000..6262c70
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/BaozhengjinCuishou.aspx.cs
@@ -0,0 +1,170 @@
+锘�/**  
+* OrderMoneyReceive.aspx.cs
+*
+* 鍔� 鑳斤細 璁㈠崟鏀舵
+* 绫� 鍚嶏細 OrderMoneyReceive
+*
+* Ver    鍙樻洿鏃ユ湡             璐熻矗浜�  鍙樻洿鍐呭
+* 鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�
+* V0.01  2013-5-28 13:44      鍚村磶鍧�    鍒濈増
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using CY.BLL.EC;
+using CY.Infrastructure.Common;
+using CY.Model;
+using CY.BLL.OA;
+using CY.BLL.Sys;
+using System.Text;
+using CY.BLL;
+using System.Transactions;
+namespace CY.WebForm.Pages.business
+{
+    public partial class BaozhengjinCuishou : BasePage
+    {
+        private EC_OrderBLL _eC_OrderBLL = null;
+
+        private OA_CorporateClientsBLL bll_OA_CorporateClientsBLL = null;
+        private EC_OrderBasicBLL _eC_OrderBasicBLL = null; 
+
+
+        private OA_StaffBLL _StaffBLL = null;
+        OA_BaozhengjinBLL oA_BaozhengjinBLL = null;
+        OA_BaozhengjincuishouBLL oA_BaozhengjincuishouBLL = null;
+
+        /// <summary>
+        /// 鍒濆鍖栨瀯閫� 
+        /// </summary>
+        public BaozhengjinCuishou()
+        {
+            bll_OA_CorporateClientsBLL = new OA_CorporateClientsBLL();
+            _StaffBLL = new OA_StaffBLL();
+            _eC_OrderBasicBLL = new EC_OrderBasicBLL();
+            oA_BaozhengjinBLL = new OA_BaozhengjinBLL();
+            oA_BaozhengjincuishouBLL = new OA_BaozhengjincuishouBLL();
+        }
+        /// <summary>
+        /// 鐣岄潰鍔犺浇浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            _eC_OrderBLL = new EC_OrderBLL();
+            btnSubmit.ServerClick += new EventHandler(btnSubmit_ServerClick);
+
+           
+            if (IsPostBack || IsCallback)
+                return;
+
+            if (!IsPostBack && !IsCallback)
+            {
+                LoadOrder();
+            }
+        }
+
+        /// <summary>
+        /// 鎻愪氦鎸夐挳鐐瑰嚮浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void btnSubmit_ServerClick(object sender, EventArgs e)
+        {
+            string orderIds = Request["ids"];
+            if (string.IsNullOrEmpty(this.txtStartTime.Value.Trim()))
+            {
+                JavaScript.MessageBox("璇烽�夋嫨鍌鏃堕棿锛�", this);
+                return;
+            }
+
+            bool isWin = false;
+ 
+
+
+
+
+            
+
+        
+
+            
+
+
+            var oA_Kaipiaonewcuishou = new OA_Baozhengjincuishou();
+            oA_Kaipiaonewcuishou.BaozhengjinId = orderIds.ToInt32().Value;
+            oA_Kaipiaonewcuishou.Creater = CurrentUser.ShortName;
+            oA_Kaipiaonewcuishou.CreateTime = DateTime.Now;
+            oA_Kaipiaonewcuishou.CuishouTime = this.txtStartTime.Value.ToDateTime2();
+            oA_Kaipiaonewcuishou.Cuikuanqingkuang = this.txtCuikuanqingkuang.Value;
+            isWin = oA_BaozhengjincuishouBLL.InsertModel(oA_Kaipiaonewcuishou);
+
+            if (isWin)
+            {
+                JavaScript.MessageBox("鎿嶄綔鎴愬姛", this, true, true);
+            }
+            else
+            {
+                JavaScript.MessageBox("鎿嶄綔澶辫触", this);
+            }
+            //JavaScript.MessageBox(isWin ? "鏀舵鎴愬姛锛�" : "鏀舵澶辫触锛�", this, "top.frmright.ReLoad();top.Dialog.close();");
+            // Request.RequestContext.RouteData.DataTokens.Add("IsWin", isWin ? "1" : "");
+
+
+
+        }
+ 
+
+        /// <summary>
+        /// 鍔犺浇璁㈠崟
+        /// </summary>
+        private void LoadOrder()
+        {
+            try
+            {
+                string orderIds = Request["id"];
+            if (string.IsNullOrEmpty(orderIds))
+            {
+                JavaScript.MessageBox("璁㈠崟涓嶅瓨鍦紒", this);
+                return;
+            }
+
+            this.ids.Value = orderIds;
+            OA_Baozhengjin oA_Kaipiaoshenqing = oA_BaozhengjinBLL.GetModelByKeyid(orderIds.ToInt32().Value);
+            
+
+            this.txtBuyerName.InnerText = oA_Kaipiaoshenqing.Shoukuandanwei;
+           
+           
+
+                this.txtStartTime.Value = DateTime.Now.ToString("yyyy-MM-dd HH:mm");
+
+
+
+
+
+
+                this.txtjine.InnerText = String.Format("{0:F}", oA_Kaipiaoshenqing.Fukuanmoney);
+               var result = oA_BaozhengjincuishouBLL.GetModelByKaipiaoId(orderIds.ToInt32().Value);
+                rptData.DataSource = result;
+                rptData.DataBind();
+
+
+            }
+            catch (Exception ex)
+            {
+                PAGEHandleException(ex);
+                JavaScript.MessageBox("璁㈠崟涓嶅瓨鍦紒", this);
+            }
+
+
+        }
+        
+ 
+
+    }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/BaozhengjinCuishou.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/BaozhengjinCuishou.aspx.designer.cs
new file mode 100644
index 0000000..c140413
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/BaozhengjinCuishou.aspx.designer.cs
@@ -0,0 +1,98 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+//     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝g‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠g爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.business
+{
+
+
+    public partial class BaozhengjinCuishou
+    {
+
+        /// <summary>
+        /// CMSHead1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
+
+        /// <summary>
+        /// form1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// txtBuyerName 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl txtBuyerName;
+
+        /// <summary>
+        /// txtjine 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl txtjine;
+
+        /// <summary>
+        /// txtStartTime 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText txtStartTime;
+
+        /// <summary>
+        /// txtCuikuanqingkuang 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlTextArea txtCuikuanqingkuang;
+
+        /// <summary>
+        /// btnSubmit 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputButton btnSubmit;
+
+        /// <summary>
+        /// ids 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputHidden ids;
+
+        /// <summary>
+        /// rptData 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Repeater rptData;
+    }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/Baozhengjinfukuan.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/Baozhengjinfukuan.aspx
new file mode 100644
index 0000000..b8c03a4
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/Baozhengjinfukuan.aspx
@@ -0,0 +1,396 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Baozhengjinfukuan.aspx.cs" Inherits="CY.WebForm.Pages.business.Baozhengjinfukuan" %>
+
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head id="Head1" runat="server">
+    <title>璁㈠崟鍒楄〃</title>
+    <uc:cmshead id="CMSHead1" runat="server" />
+    <script src="../../js/business/Order.js" type="text/javascript"></script>
+    <script type="text/javascript">
+
+        /*
+  纭鎵归噺寮�绁ㄧ敵璇�
+  */
+        //function ToBatchPayList() {
+
+        //    var ids = '';
+        //    var cks = $("input[name='ckId']:checked");
+        //    if (cks.length == 0) { alertMsg('娌℃湁閫変腑浠讳綍椤癸紒'); return; } else { }
+        //    var isCan = true;
+        //    var BuyerId = '';
+        //    var SellerOrderIds = '';
+        //    var bbbb = true;
+        //    var cccc = true;
+        //    cks.each(
+        //        function () {
+                   
+        //            var ckVal = $(this).val();
+
+        //            var ckValJson = eval('(' + ckVal + ')');
+                   
+        //            PayState = ckValJson.PayState;
+        //            //鍓旈櫎宸茬粡寮�绁ㄧ敵璇风殑鍗曟嵁
+        //            if (BuyerId != '' && ckValJson.buyerId != BuyerId) {
+        //                bbbb = false;
+
+        //            } else {
+        //                BuyerId = ckValJson.buyerId;
+        //            }  
+        //            if (ckValJson.Kaipiaoshenqing != 1) {
+        //                cccc = false;
+        //            }
+
+        //            ids = ids + ',' + ckValJson.id;
+
+                   
+                    
+        //        }
+        //    );
+ 
+        //    if (!bbbb) {
+        //        alertMsg('蹇呴』鏄悓涓�瀹跺鎴凤紒');
+        //        return;
+        //    }
+        //    if (!cccc) {
+        //        alertMsg('鏈夌姸鎬佷笉鏄紑绁ㄥ凡鐢宠鐨勮鍗曪紒');
+        //        return;
+        //    }
+
+        //    if (!isCan) {
+        //        // alertMsg('璇烽�夋嫨鏈彈鐞嗙殑璁㈠崟锛�');
+        //    }
+        //    else {
+        //        if (ids != '') {
+        //            ids = ids.substring(1);
+        //            SellerOrderIds = SellerOrderIds.substring(1);
+
+        //        } else {
+        //            alertMsg('娌℃湁閫変腑鏈敮浠樿鍗曪紒');
+        //            return;
+        //        }
+
+        //        top.Dialog.open({ URL: '/Pages/business/BaozhengjinfukuanEdit.aspx?id=' + ids, Title: '鎵归噺纭鍙戠エ', Height: 400, Width: 600 });
+        //    }
+        //}
+        //鏌ョ湅瀹㈡埛璧勬枡
+        function Viewkehuqianshou(Keyid, SellerOrderId) {
+            top.Dialog.open({ URL: "/Pages/business/OrderKehuqianshou.aspx?id=" + Keyid + "&SellerOrderId=" + SellerOrderId, Title: "瀹㈡埛绛炬敹", Width: 400, Height: 600 });
+        }
+
+
+        //鏌ョ湅瀹㈡埛璧勬枡
+        function Viewkehu(personId) {
+            top.Dialog.open({ URL: "/Pages/business/BaozhengjinfukuanEdit.aspx?id=" + personId, Title: "纭鍙戠エ", Width: 400, Height: 600 });
+        }
+
+        //鍌敹
+        function ViewCuishou(personId) {
+            top.Dialog.open({ URL: "/Pages/business/BaozhengjinCuishou.aspx?id=" + personId, Title: "鍌", Width: 600, Height: 800 });
+        }
+        //澶栧崗浠樻
+        function ViewShoukuan(personId, yongtu, supplierId) {
+           
+                top.Dialog.open({ URL: "/Pages/financial/BaozhengjinIncome.aspx?id=" + personId, Title: "淇濊瘉閲戞敹娆�", Width: 600, Height: 500 });
+           
+         
+           
+           
+        }
+        //鏀跺叆纭
+        function ViewShouru(personId, shenqingleixing) {
+            if (shenqingleixing == "璁㈠崟寮�绁�") {
+                top.Dialog.open({ URL: "/Pages/financial/InvoicingShouruqueren.aspx?id=" + personId, Title: "璁㈠崟纭鏀跺叆", Width: 600, Height: 800 });
+            } else {
+                top.Dialog.open({ URL: "/Pages/financial/DepositsCustomershouruqueren.aspx?Keyid=" + personId, Title: "瀹㈡埛棰勪粯娆剧‘璁ゆ敹鍏�", Width: 900, Height: 680 });
+            }
+
+        }
+        
+        
+        //鍥炴
+        function ViewFukuan(personId) {
+            top.Dialog.open({ URL: "/Pages/business/InvoicingHuikuan.aspx?id=" + personId, Title: "浠樻鐧昏", Width: 400, Height: 600 });
+        }
+
+        
+        //鏌ョ湅瀹㈡埛璧勬枡
+        function Viewkaipiao(Keyid, SellerOrderId, yongtu, supplierId) {
+            
+            if (yongtu == "澶栧崗鍔犲伐璐�") {
+                if (supplierId.length > 10) {
+                    top.Dialog.open({ URL: "/Pages/business/WaixieOrderPrint.aspx?Keyid=&SellerOrderId=" + SellerOrderId, Title: "鏌ョ湅澶栧崗璁㈠崟", Width: 1080, Height: 650 });
+                } else {
+                    top.Dialog.open({ URL: "/Pages/business/InvoicingOrderPrint.aspx?Keyid=&SellerOrderId=" + SellerOrderId, Title: "鏌ョ湅璁㈠崟", Width: 1080, Height: 650 });
+                }
+
+            } else if (yongtu == "閲囪喘浠樻"){
+                top.Dialog.open({ URL: "/Pages/procurement/ProcurementListHTML.aspx?Keyid=" + SellerOrderId, Title: "鏌ョ湅閲囪喘璁㈠崟", Width: 1080, Height: 650 });
+            }
+           
+        }
+        //鏌ョ湅
+        function onView(keyid, yongtu) {
+            if (yongtu != "鍏朵粬浠樻" && yongtu != "澶栧崗鍔犲伐璐�") {
+                top.Dialog.open({ URL: "/Pages/procurement/SuppliersDetail.aspx?Keyid=" + keyid, Title: "鏌ョ湅渚涘簲鍟�", Width: 950, Height: 650 });
+            }
+          
+        }
+
+ 
+    </script>
+    <style type="text/css">
+        .tableStyleXS th { padding: 1px 0 1px 3px; background-image:none; border-bottom:1px solid #CCC; }
+        .tableStyleXS td { padding: 1px 0 1px 3px; }
+        .TableNewStyle select { width: 80px; }
+        .td_hide span { text-decoration: default; display: none; text-align: center; }
+        span.hand_no { cursor: default; display: block; font-size: 12px; }
+        span.hand_no:hover { text-decoration: none; }
+        span.hand_yes { cursor: pointer; display: block; font-size: 12px; }
+        .td_hide { cursor: pointer; }
+        .auto-style1 {
+            width: 39px;
+        }
+        .auto-style3 {
+            width: 13px;
+        }
+        .auto-style4 {
+            width: 55px;
+        }
+        .auto-style5 {
+            width: 26px;
+        }
+        .auto-style6 {
+            cursor: pointer;
+            width: 26px;
+        }
+    </style>
+</head>
+<body>
+    <form id="form1" runat="server">
+    <div id="scrollContent" style="width: auto;">
+        <div class="box1">
+            <table class="TableNewStyle" style="width: 100%;">
+                 <tr>
+                    <td class="ali03">
+                        鎿嶄綔鏃堕棿锛�
+                    </td>
+                    <td style="width: 215px">
+                        <input id="txtSQBeginDate" type="text" runat="server" class='date w80px' maxlength='10' />-<input id="txtSQEndDate" type="text" runat="server" class='date w80px' maxlength='10' />
+                    </td>
+                    <td class="ali03">
+                        璐︽埛绫诲瀷锛�
+                    </td>
+                    <td>
+
+                        <asp:DropDownList runat="server" ID="dwAcoountType" AutoPostBack="true" keepDefaultStyle="true" OnSelectedIndexChanged="dwAcoountType_SelectedIndexChanged">
+                        </asp:DropDownList>
+
+                    </td>
+                      <td class="ali03">
+                       璐︽埛鍚嶇О锛�
+                    </td>
+                    <td>
+                       
+                           <select id="selAccountName" runat="server" datatextfield="AccountName" datavaluefield="Keyid" keepdefaultstyle='true' class="Sreq w122px">
+                        </select>
+                    </td>
+                       <td class="ali03">
+                       鏀舵鍗曚綅锛�
+                    </td>
+                    <td>
+                        <input id='Shoukuandanwei' runat="server" maxlength='50' />
+                    </td>
+                       <td class="ali03">
+                       鎽樿锛�
+                    </td>
+                    <td>
+                        <input id='remark' runat="server" maxlength='50' />
+                    </td>
+
+
+                    <td class="ali03">
+                       鏄惁閫�娆撅細
+                    </td>
+                    <td>
+                         <select keepdefaultstyle='true' id='TuikuanStatus' runat="server" >
+                           <option value="">鍏ㄩ儴</option>
+                            <option value="2">宸查��娆�</option>
+                            <option value="1">鏈��娆�</option>
+                        </select>
+                    </td>
+                   
+
+                    
+                 
+                     
+                     
+                    <td  >
+                        <asp:button id="btn_Search" text="鏌ヨ" runat="server" />&nbsp;<input type="button" value='閲嶇疆' onclick='document.body.innerHTML="";window.location=window.location;' />
+                       
+                    </td>
+                </tr>
+            </table>
+        </div>
+   <%--    <div class="box_tool_min">
+            <div class="center" style=" margin-left:0px;">
+                <div class="left">
+                    <div class="right">
+                        <div class="padding_top5 padding_left10">
+                           
+                            
+                           
+                           
+                            <a href="javascript:;"   onclick="ToBatchPayList();"><span class="icon_edit">纭寮�绁�</span></a>
+                            <div class="box_tool_line">
+                            </div>
+                            
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="clear">
+            </div>
+        </div>--%>
+        <div clear="fl" dir="ltr">
+            <table class="tableStyle tableStyleXS" useclick="false" usecheckbox="true" sortmode="false" id="test_table">
+                <thead>
+                    <tr>
+                        <th width="25">
+                            缂栧彿
+                        </th>
+                          <th style="text-align: center;" width="70">
+                           浠樻鏃堕棿
+                        </th>
+                         <th style="text-align: center;" width="70">
+                           璐︽埛绫诲瀷
+                        </th>
+                        <th style="text-align: center;"width="150">
+                            浠樻璐︽埛
+                        </th>
+                         <th style="text-align: center;" width="70">
+                           閲戦
+                        </th>
+                         <th style="text-align: center;" width="150">
+                           鏀舵鍗曚綅
+                        </th>
+                         <th style="text-align: center;" width="150">
+                           鎽樿
+                        </th>
+                         <th style="text-align: center;" width="70">
+                           閫�娆炬椂闂�
+                        </th>
+                         <th style="text-align: center;" width="70">
+                           閫�娆剧姸鎬�
+                        </th>
+                        
+                          <th style="text-align: center;" width="70">
+                           鐢宠浜�
+                        </th>
+                        
+                          <th width="70">
+                            鍌璁板綍
+                        </th>
+                        
+                         
+                         <th width="70">
+                          鎿嶄綔
+
+                        </th>
+                       
+                      
+                    </tr>
+                </thead>
+                <tbody>
+                    <asp:repeater id="rptData" runat="server">
+                        <itemtemplate>
+                            <tr>
+                                 
+                               <td>
+                                    <%#Container.ItemIndex +1 /*(UCPager1.PageSize *( UCPager1.PageIndex-1)+1)*/%>
+                                </td>
+                                <td>
+                                   <%#Eval("FukuanTime", "{0:yyyy-MM-dd}")%>
+                                     
+                                </td>
+                                  <td style="text-align: center;">
+                                        <%#Eval("Zhanghuleixing")%>
+
+                                   
+                                </td>
+                                 <td style="text-align: center;">
+                                     
+                                   <%#Eval("Fukuanzhanghu")%>
+                                </td>
+                                 <td style="text-align: center;">
+                                     <%#Eval("Fukuanmoney", "{0:F}")%>    
+                                   
+                                </td>
+                                 <td style="text-align: center;">
+                                        <%#Eval("Shoukuandanwei")%>
+
+                                   
+                                </td>
+                                 <td style="text-align: center;">
+                                        <%#Eval("remark")%>
+
+                                   
+                                </td>
+                                <td style="text-align: center;">
+                                        <%#Eval("TuikuanTime", "{0:yyyy-MM-dd}")%>
+
+                                   
+                                </td>
+                                 <td>
+                                     <%#Eval("TuikuanName")%>
+                                </td>
+                                 <td>
+                                     <%#Eval("MemberName")%>
+                                </td>
+                                
+                                 
+                                
+                               <td>
+                                                            
+                             
+                                <a href='javascript:void(0)' menu_member_case_id="case_cuikuan" menu_member_case_name="鍌" title='鍌' class='a_under' onclick='ViewCuishou("<%#Eval("Keyid")%>")'> 鏌ョ湅    </a>  
+                                     </td>
+                                 <td>
+                                      
+                                         
+                                     <a href='javascript:void(0)' menu_member_case_id="case_shoukuan" menu_member_case_name="鏀舵" title='鏀舵' class='a_under' onclick='ViewShoukuan("<%#Eval("Keyid")%>")'> 鏀舵    </a> 
+                                     
+                                </td>
+                                
+                            </tr>
+                        </itemtemplate>
+                    </asp:repeater>
+                </tbody>
+                  <tr>
+                        <td colspan="4">
+                           鍚堣
+                        </td>
+                           
+                        
+                         <td >
+                            <span id="heji" runat="server" ></span>
+                        </td>
+                     
+                        <td colspan="6">
+                           
+                        </td>
+                        
+                       
+                      
+                    </tr>
+            </table>
+            <uc:ucpager id="UCPager1" runat="server" />
+        </div>
+    </div>
+    </form>
+</body>
+  <script type="text/javascript" language="javascript">
+     
+
+  </script>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/Baozhengjinfukuan.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/Baozhengjinfukuan.aspx.cs
new file mode 100644
index 0000000..bb6ab26
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/Baozhengjinfukuan.aspx.cs
@@ -0,0 +1,815 @@
+锘�/**  
+* OrderList.aspx.cs
+*
+* 鍔� 鑳斤細 璁㈠崟鍒楄〃
+* 绫� 鍚嶏細 OrderList
+*
+* Ver    鍙樻洿鏃ユ湡             璐熻矗浜�  鍙樻洿鍐呭
+* 鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�
+* V0.01  2013-5-6 9:16        鍚村磶鍧�    鍒濈増
+* V0.02  2013-5-6 18:02       鍚村磶鍧�    瀹屾垚鍒嗛〉鏌ヨ  
+* V0.03  2013-5-7 17:28       鍚村磶鍧�    澧炲姞璁㈠崟鐘舵�佽缃�(缃负锛氱敓浜с�佸畬鎴�)骞跺姞涓婁互闄愬埗(濡�:绾夸笂璁㈠崟涓嶅彲缃负瀹屾垚)銆�
+*                                       澧炲姞鎵归噺鍒犻櫎骞朵簣浠ラ檺鍒�(鍙兘鍒犻櫎鏈彈鐞嗙殑鍘傚晢鏂板璁㈠崟)銆�
+*                                       澧炲姞鍙楃悊鎿嶄綔骞跺姞浠ラ檺鍒�(鍙湁鏈彈鐞嗙殑璁㈠崟鎵嶈兘鍙楃悊)
+*
+*
+*
+*
+*/
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using CY.BLL.EC;
+using CY.Model;
+using CY.BLL.Sys;
+using CY.Infrastructure.Common;
+using CY.BLL;
+using CY.WebForm.Pages.common;
+using System.Transactions;
+using CY.BLL.OA;
+
+namespace CY.WebForm.Pages.business
+{
+    public partial class Baozhengjinfukuan : BasePage
+    {
+        EC_OrderBasicBLL _eC_OrderBasicBLL = null;
+        OA_StaffBLL bll_OA_StaffBLL = null;
+        LF_OrderFileBLL _lF_OrderFileBLL = null;
+        EC_OrderBLL _eC_OrderBLL = null;
+        OA_BaozhengjinBLL oA_BaozhengjinBLL = null;
+        Sys_DictionaryBLL _Sys_DictionaryBLL = null;
+        OA_FirmAccountBLL _OA_FirmAccountBLL = null;
+
+        /// <summary>
+        /// 鍒濆鍖栨瀯閫�
+        /// </summary>
+        public Baozhengjinfukuan()
+        {
+            _eC_OrderBasicBLL = new EC_OrderBasicBLL();
+            bll_OA_StaffBLL = new OA_StaffBLL();
+            _lF_OrderFileBLL = new LF_OrderFileBLL();
+            _eC_OrderBLL = new EC_OrderBLL();
+            oA_BaozhengjinBLL = new OA_BaozhengjinBLL();
+            _Sys_DictionaryBLL = new Sys_DictionaryBLL();
+            _OA_FirmAccountBLL = new OA_FirmAccountBLL();
+        }
+
+        /// <summary>
+        /// 鍔犺浇浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            try
+            {
+                if (Request["downId"] != null)
+                {
+                    int iDownId = Convert.ToInt32(Request["downId"]);
+                    LF_OrderFile model = _lF_OrderFileBLL.GetModel(iDownId);
+                    model.FileState = 1;
+                    _lF_OrderFileBLL.UpdateModel(model);
+                    string fileName = "";//瀹㈡埛绔繚瀛樼殑鏂囦欢鍚�
+                    string filePath = "";//璺緞
+                    if (model != null)
+                    {
+                        fileName = model.FileName;//瀹㈡埛绔繚瀛樼殑鏂囦欢鍚�
+                        filePath = model.FilePath;//璺緞
+                    }
+                    else
+                    {
+                        JavaScript.MessageBox("鏂囦欢涓嶅瓨鍦�", this);
+                        return;
+                    }
+                    System.IO.FileInfo fileInfo = new System.IO.FileInfo(filePath);
+                    if (fileInfo.Exists == true)
+                    {
+                        const long ChunkSize = 102400;//100K 姣忔璇诲彇鏂囦欢锛屽彧璇诲彇100K锛岃繖鏍峰彲浠ョ紦瑙f湇鍔″櫒鐨勫帇鍔�
+                        byte[] buffer = new byte[ChunkSize];
+                        Response.Clear();
+                        System.IO.FileStream iStream = System.IO.File.OpenRead(filePath);
+                        long dataLengthToRead = iStream.Length;//鑾峰彇涓嬭浇鐨勬枃浠舵�诲ぇ灏�
+                        Response.ContentType = "application/octet-stream";
+                        Response.AddHeader("Content-Disposition", "attachment; filename=" + HttpUtility.UrlEncode(fileName));
+                        while (dataLengthToRead > 0 && Response.IsClientConnected)
+                        {
+                            int lengthRead = iStream.Read(buffer, 0, Convert.ToInt32(ChunkSize));//璇诲彇鐨勫ぇ灏�
+                            Response.OutputStream.Write(buffer, 0, lengthRead);
+                            Response.Flush();
+                            dataLengthToRead = dataLengthToRead - lengthRead;
+                        }
+                        Response.Close();
+                    }
+                    Response.Redirect("/Pages/business/OrderListBatchOperation.aspx");
+                    return;
+                }
+                switch (Request["Target"])
+                {
+                    case "deleteOrderAll2":
+                        AcceptAll2();
+                        break;
+                    case "deleteOrderAll3":
+                        AcceptAll3();
+                        break;
+                    case "AcceptOrder":
+                        Accept();
+                        break;
+                    case "AcceptOrderAll":
+                        AcceptAll();
+                        break;
+                    case "ChangeState":
+                        //ChangeOrderState();
+                        break;
+                    case "BatchDelete":
+                        CY.WebForm.cs.WebUtil.DeleteData(_eC_OrderBasicBLL.DeleteDataByIds, CurrentUser.ShortName);//璋冪敤閫氱敤鍒犻櫎鏂规硶
+                        break;
+                    case "BatchToOver":
+                        UpdataState(-1);//璁剧疆鐘舵�佷负瀹屾垚(涓嶈兘鏄�1'鏈彈鐞�'鎴�2'宸插彈鐞�')
+                        break;
+                    case "BatchToProduction":
+                        //UpdataState(3);//璁剧疆鐘舵�佷负鐢熶骇涓�(涓嶈兘鏄�1'鏈彈鐞�'鎴�2'宸插彈鐞�')
+                        break;
+                    case "BatchToSend":
+                        UpdataState(4);//璁剧疆鐘舵�佷负宸插畬宸� (涓嶈兘鏄�1'鏈彈鐞�'鎴�2'宸插彈鐞�')
+                        break;
+                    case "ToAccountDelay":
+                        Delay(1);//璇锋眰鎵撴寤舵湡
+                        break;
+                    case "DeliveryDelay":
+                        Delay(2);//璇锋眰浜よ揣寤舵湡
+                        break;
+                    case "OrderRepeal":
+                        Delay(3);//璇锋眰鎾ゅ崟
+                        break;
+                    case "ReplyRequest"://绛斿璁㈠崟璇锋眰
+                        RequestReply();
+                        break;
+                    case "RetireOrderBySeller": //鍗栧鐩存帴鎾ゅ崟锛屾垨鑰�
+                        RetireOrderBySeller();
+                        break;
+                    case "CanPrintAwb":
+                        CanPrintAwb();
+                        break;
+                    default:
+                        Page_Load_Default();
+                        return;
+                }
+            }
+            catch (Exception ex)
+            {
+                PAGEHandleException(ex);
+                Response.Clear();
+                //Response.Write("鍙傛暟閿欒");
+                Response.Write(ex.Message);
+            }
+            Response.End();
+        }
+
+        /// <summary>
+        /// 鍒ゆ柇鏄惁鍙互鎵归噺鎵撳嵃閫佽揣鍗�
+        /// </summary>
+        public void CanPrintAwb()
+        {
+            EC_AcceptWayByOrderBLL _AcceptWayByOrderBLL = new EC_AcceptWayByOrderBLL();
+            string orderIds = Request["orderIds"].ToString();
+            string[] orderIdArry = orderIds.Split(',');
+            bool IsFirst = true;
+            string firstAccepterAddress = string.Empty;
+            string result = string.Empty;
+            string jsonStr = "IsCan:'true'";
+            string msg = "鍙湁閫佽揣涓婇棬涓旈�佽揣鍦板潃鐩稿悓鐨勮鍗曟墠鑳芥墦鍗伴�佽揣鍗�";
+            foreach (string orderIdStr in orderIdArry)
+            {
+                int orderId = orderIdStr.ToInt32().Value;
+                EC_AcceptWayByOrder model = _AcceptWayByOrderBLL.GetModelByTargetId(orderId);
+                if (model == null)
+                    continue;
+                if (IsFirst)
+                {
+                    firstAccepterAddress = model.AccepterAddress.Trim();
+                }
+                if (model.AcceptTypeId.Value != 106)
+                {
+                    jsonStr = "IsCan:'false',Msg:'" + msg + "'";
+                    break;
+                }
+                if (model.AccepterAddress.Trim() != firstAccepterAddress)
+                {
+                    jsonStr = "IsCan:'false',Msg:'" + msg + "'";
+                    break;
+                }
+                IsFirst = false;
+            }
+            result = "{" + jsonStr + "}";
+            Response.Write(result);
+        }
+
+        /// <summary>
+        /// 鏇存柊鐘舵��
+        /// </summary>
+        private void UpdataState(int stateId)
+        {
+            Response.Clear();
+            if (1 == stateId || 2 == stateId)
+            {
+                HttpContext.Current.Response.Write(-2);
+                return;
+            }
+            string paramValue = HttpContext.Current.Request["ids"];
+            //string stateStr=HttpContext.Current.Request["state"];
+            string remark = string.Format("{0}", Request["remark"]);
+            int? tempId;
+            //tempId = string.IsNullOrEmpty(stateStr)?null:MyConvert.ConvertToInt32(stateStr);
+            if (string.IsNullOrEmpty(paramValue)/*||!tempId.HasValue*/)
+            {
+                HttpContext.Current.Response.Write(-2);
+                return;
+            }
+            else
+            {
+            }
+
+            //int stateId=tempId.Value;
+            string[] splitResult = paramValue.Split(',');
+            int i = -1;
+
+            List<EC_OrderOperate> oprates = new List<EC_OrderOperate>();
+            while (++i < splitResult.Length)
+            {
+                tempId = MyConvert.ConvertToInt32(splitResult[i]);
+                if (!tempId.HasValue)
+                {
+                    HttpContext.Current.Response.Write(-2);
+                    return;
+                }
+                else
+                {
+                }
+                oprates.Add(new EC_OrderOperate()
+                {
+                    OperateType = stateId,
+                    OrderId = tempId.Value,
+                    Operator = CurrentUser.ShortName,
+                    Remark = remark
+                });
+            }
+            HttpContext.Current.Response.Write((_eC_OrderBasicBLL.UpdateOrderState(oprates.ToArray()) ? 1 : 0));
+        }
+
+        /// <summary>
+        /// 鍙楃悊璁㈠崟(鍏ㄩ儴璁㈠崟鍙楃悊)
+        /// </summary>
+        private void Accept()
+        {
+            Response.Clear();
+            PayAbout payAbout = new PayAbout();
+            payAbout.LoadNewestPaymentAccount(true);
+            double? commission = MyConvert.ConvertToDouble(CY.Config.WebInfo.Instance.FirmOrderAgencyFee);
+            int? orderId = string.IsNullOrEmpty(Request["id"]) ? null : MyConvert.ConvertToInt32(Request["id"]);
+            if (!orderId.HasValue || !commission.HasValue)
+            {
+                Response.Write("-2");
+                return;
+            }
+            else
+            {
+            }
+            Response.Write(_eC_OrderBasicBLL.AcceptOrder(orderId.Value, commission.Value) ? "1" : "0");
+        }
+
+        /// <summary>
+        /// 鎵归噺鍙楃悊璁㈠崟
+        /// </summary>
+        public void AcceptAll()
+        {
+            Response.Clear();
+            PayAbout payAbout = new PayAbout();
+            payAbout.LoadNewestPaymentAccount(true);
+            double? commission = MyConvert.ConvertToDouble(CY.Config.WebInfo.Instance.FirmOrderAgencyFee);
+            string orderIds = string.Empty;
+            ;
+            if (Request["ids"] != null)
+            {
+                orderIds = Request["ids"].ToString();
+            }
+            if (string.IsNullOrEmpty(orderIds) || !commission.HasValue)
+            {
+                Response.Write("-2");
+                return;
+            }
+            else
+            {
+            }
+            Response.Write(_eC_OrderBasicBLL.AcceptOrderAll(orderIds, commission.Value) ? "1" : "0");
+        }
+
+        /// <summary>
+        /// 鏀瑰彉璁㈠崟鐘舵��(鏆傛椂涓嶅惎鐢�)
+        /// </summary>
+        private void ChangeOrderState()
+        {
+            Response.Clear();
+            string idsStr = Request["ids"];
+            string stateIdStr = Request["stateId"];
+            string remark = string.Format("{0}", Request["remark"]);
+            int? stateId = string.IsNullOrEmpty(stateIdStr) ? null : MyConvert.ConvertToInt32(stateIdStr);
+            if (string.IsNullOrEmpty(idsStr) || !stateId.HasValue)
+            {
+                Response.Write("-2");
+                return;
+            }
+            else
+            {
+            }
+            string[] ids = idsStr.Split(',');
+
+            int i = -1;
+            int? tempId = null;
+            List<EC_OrderOperate> operaters = new List<EC_OrderOperate>();
+            while (++i < ids.Length)
+            {
+                tempId = string.IsNullOrEmpty(ids[i]) ? null : MyConvert.ConvertToInt32(ids[i]);
+                if (!tempId.HasValue)
+                {
+                    operaters = null;
+                    break;
+                }
+                else
+                {
+                }
+                operaters.Add(new EC_OrderOperate()
+                {
+                    OrderId = tempId.Value,
+                    Operator = CurrentUser.ShortName,
+                    OperateType = stateId.Value,
+                    Remark = remark
+                });
+            }
+            if (null == operaters)
+            {
+                Response.Write("-2");
+                return;
+            }
+            else
+            {
+            }
+            Response.Write(_eC_OrderBasicBLL.UpdateOrderState(operaters.ToArray()) ? "1" : "0");
+        }
+
+        /// <summary>
+        /// 鍗栧閫�鍗�
+        /// </summary>
+        public void RetireOrderBySeller()
+        {
+            string orderidStr = Request["orderid"];
+            string tovalueStr = Request["tovalue"];
+
+            int orderId = orderidStr.ToInt32().Value;
+            decimal retireMony = tovalueStr.ToDecimal2().Value;
+            string operatorName = CurrentUser.ShortName;
+            Response.Write(_eC_OrderBasicBLL.RetireOrderBySeller(orderId, retireMony, operatorName));
+        }
+
+        /// <summary>
+        /// 璇锋眰寤舵湡
+        /// </summary>
+        /// <param name="typeId">璇锋眰绫诲瀷</param>
+        private void Delay(int typeId)
+        {
+            Response.Clear();
+            string receiverStr = Request["receiver"];
+            string orderidStr = Request["orderid"];
+            string tovalueStr = Request["tovalue"];
+            if (string.IsNullOrEmpty(receiverStr) || string.IsNullOrEmpty(orderidStr) || string.IsNullOrEmpty(tovalueStr))
+            {
+                Response.Write(0);
+                return;
+            }
+            else
+            {
+            }
+
+            int? orderid = MyConvert.ConvertToInt32(orderidStr);
+            int? tovalue = MyConvert.ConvertToInt32(tovalueStr);
+            Guid receiver = MyConvert.ConvertToGuid(receiverStr);
+            if (Guid.Empty == receiver || !orderid.HasValue || !tovalue.HasValue)
+            {
+                Response.Write(0);
+                return;
+            }
+            else
+            {
+            }
+            EC_OrderDialogue _eC_OrderDialogue = new EC_OrderDialogue();
+            _eC_OrderDialogue.ReceiverId = receiver;
+            _eC_OrderDialogue.TargetOrder = orderid;
+            _eC_OrderDialogue.TargetValue = tovalue;
+            _eC_OrderDialogue.DialogueTypeId = typeId;
+            _eC_OrderDialogue.InitiatorId = CurrentUser.MemberId;
+            _eC_OrderDialogue.DialogueContent = string.Format("{0}", Request["dialoguecontent"]);
+            //寮�濮嬭姹�
+            Response.Write(_eC_OrderBasicBLL.OrderPropertyChangeRequest(_eC_OrderDialogue));
+        }
+
+        /// <summary>
+        /// 绛斿娓呭崟璇锋眰 
+        /// </summary>
+        private void RequestReply()
+        {
+            Response.Clear();
+            string ridStr = Request["did"];
+            string isAllowStr = Request["isAllow"];
+            Guid rid = MyConvert.ConvertToGuid(ridStr);
+            bool? isAllow = Convert.ToBoolean(isAllowStr);
+            if (Guid.Empty == rid || !isAllow.HasValue)
+            {
+                Response.Write(0);
+                return;
+            }
+            else
+            {
+            }
+            Response.Write(_eC_OrderBasicBLL.OrderPropertyChangeReply(rid, CurrentUser.MemberId, isAllow.Value));
+        }
+
+        private void ToBatchRemove()
+        {
+            string orderidStr = Request["orderid"];
+            string tovalueStr = Request["tovalue"];
+
+            int orderId = orderidStr.ToInt32().Value;
+            decimal retireMony = tovalueStr.ToDecimal2().Value;
+            string operatorName = CurrentUser.ShortName;
+            Response.Write(_eC_OrderBasicBLL.RetireOrderBySeller(orderId, retireMony, operatorName));
+        }
+        /// <summary>
+        /// 榛樿鎵ц鏂规硶
+        /// </summary>
+        private void Page_Load_Default()
+        {
+            UCPager1.AspNetPager.PageChanged += AspNetPager_PageChanged;
+            btn_Search.Click += btn_Search_Click;
+            // txtCommission.Value = CY.Config.WebInfo.Instance.FirmOrderAgencyFee;
+            List<EC_OrderDialogue> dialogues = _eC_OrderBasicBLL.SelectPropertyChangeRequest(CurrentUser.MemberId) as List<EC_OrderDialogue>;
+
+
+            if (!IsPostBack && !IsCallback)
+            {
+                Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//瀛楀吀涓氬姟閫昏緫鎿嶄綔绫诲璞�
+                SysInquiry_PrintingTypeBLL _sysInquiry_PrintingTypeBLL = new SysInquiry_PrintingTypeBLL();//鍗板埛涓氬姟绫诲瀷涓氬姟閫昏緫鎿嶄綔绫诲璞�
+
+
+
+                ///璐︽埛绫诲瀷
+                dwAcoountType.DataSource = _Sys_DictionaryBLL.GetDataByType("璐︽埛绫诲瀷");
+                dwAcoountType.DataTextField = "Name";
+                dwAcoountType.DataValueField = "Keyid";
+                dwAcoountType.DataBind();
+                dwAcoountType.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+
+                /////璐︽埛鍚嶇О
+                selAccountName.DataSource = _OA_FirmAccountBLL.getAllSubject(CurrentUser.MemberId, "");
+                selAccountName.DataBind();
+                selAccountName.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+
+                this.txtSQBeginDate.Value = DateTime.Now.AddDays(-14).ToString("yyyy-MM-dd");
+                this.txtSQEndDate.Value = DateTime.Now.ToString("yyyy-MM-dd");
+                this.TuikuanStatus.Value = "1";
+                //鍒濇鏁版嵁鍔犺浇
+                btn_Search_Click(btn_Search, new EventArgs());
+            }
+        }
+
+        protected void dwAcoountType_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            selAccountName.DataSource = _OA_FirmAccountBLL.getAllSubject(CurrentUser.MemberId, this.dwAcoountType.SelectedItem.Text);
+            selAccountName.DataBind();
+            selAccountName.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+        }
+
+        #region 鏌ヨ
+
+        /// <summary>
+        /// 鎼滅储鎸夐挳鐐瑰嚮浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void btn_Search_Click(object sender, EventArgs e)
+        {
+
+            /* if (this.txtCustormerName.Value.Trim() == "")
+            {
+                Response.Write("瀹㈡埛鍚嶇О涓嶈兘涓虹┖锛岃杈撳叆瀹㈡埛鍚嶇О鍐嶆煡璇⑩�︹��");
+                return;
+            }*/
+            //Dictionary<int, object> searchParam = new Dictionary<int, object>();
+
+            //SetParamValue(searchParam, 1, CurrentUser.MemberId);
+            //SetParamValue(searchParam, 2, "");
+            //SetParamValue(searchParam, 3, this.txtCustormerName.Value.Trim());
+            //SetParamValue(searchParam, 4, "");
+            //SetParamValue(searchParam, 5, "");
+            //SetParamValue(searchParam, 6, "");
+            //SetParamValue(searchParam, 7, "");
+            //SetParamValue(searchParam, 8, "");
+            //SetParamValue(searchParam, 9, this.selPayStates.Value);
+            //SetParamValue(searchParam, 10, "");
+            //SetParamValue(searchParam, 11, "");
+            //SetParamValue(searchParam, 12, "");
+            //SetParamValue(searchParam, 13, this.selBusinessManager.Value);
+            //SetParamValue(searchParam, 14, "");
+            //SetParamValue(searchParam, 15, "");
+            //SetParamValue(searchParam, 16, "");
+            //SetParamValue(searchParam, 18, (CurrentUser.StaffId > 0 ? 1 : 0));
+            //SetParamValue(searchParam, 19, CurrentUser.TrueMemberId);
+            //SetParamValue(searchParam, 20, CurrentUser.StaffId);
+            //SetParamValue(searchParam, 21, CurrentUser.TrueName);
+
+
+            //SetParamValue(searchParam, 22, this.txtSQBeginDate.Value);
+            //SetParamValue(searchParam, 23, this.txtSQEndDate.Value);
+            //SetParamValue(searchParam, 24, this.selKaipiaoshenqing.Value);
+            //SetParamValue(searchParam, 25, this.selKehuqianshou.Value);
+            //SearchParam = searchParam;
+
+            UCPager1.AspNetPager.CurrentPageIndex = 1;//閲嶇疆椤垫暟
+            //鍐嶆鏌ヨ
+            AspNetPager_PageChanged(UCPager1.AspNetPager, new EventArgs());
+        }
+
+        /// <summary>
+        /// 璁剧疆鏌ヨ鍙傛暟鏂规硶
+        /// </summary>
+        /// <param name="target">璁剧疆鐩爣</param>
+        /// <param name="key">閿�</param>
+        /// <param name="value">鍊�</param>
+        private static void SetParamValue(Dictionary<int, object> target, int key, object value)
+        {
+            if (string.IsNullOrEmpty(string.Format("{0}", value)))
+                return;
+            else
+            {
+            }
+
+            if (target.ContainsKey(key))
+            {
+                target[key] = value;
+            }
+            else
+            {
+                target.Add(key, value);
+            }
+        }
+
+        /// <summary>               
+        /// 鍒嗛〉浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void AspNetPager_PageChanged(object sender, EventArgs e)
+        {
+            // UCPager1.AspNetPager.PageSize = 3;
+
+            Infrastructure.Query.Pagination pagination = new Infrastructure.Query.Pagination()
+            {
+                PageSize = UCPager1.AspNetPager.PageSize,
+                PageIndex = UCPager1.AspNetPager.CurrentPageIndex
+            };
+            IEnumerable<OA_Baozhengjin> result = oA_BaozhengjinBLL.SelectModelPage(pagination, CurrentUser.MemberId, this.txtSQBeginDate.Value, this.txtSQEndDate.Value, this.dwAcoountType.SelectedValue, this.selAccountName.Value,this.Shoukuandanwei.Value, this.remark.Value,this.TuikuanStatus.Value);
+            rptData.DataSource = result;
+            rptData.DataBind();
+
+            heji.InnerText = String.Format("{0:F2}", result.Sum(x => x.Fukuanmoney));
+
+            UCPager1.AspNetPager.RecordCount = pagination.RecordCount;
+        }
+
+        /// <summary>
+        /// 鏌ヨ鍙傛暟
+        /// </summary>
+        private Dictionary<int, object> SearchParam
+        {
+            get
+            {
+                return ViewState["SearchParam"] as Dictionary<int, object>;
+            }
+            set
+            {
+                ViewState["SearchParam"] = value;
+            }
+        }
+
+        /// <summary>
+        /// 鏄惁鍙互鎿嶄綔
+        /// </summary>
+        /// <param name="keyid"></param>
+        /// <param name="orderState"></param>
+        /// <param name="opType"></param>
+        /// <returns></returns>
+        public bool IsCanOpearte(object keyidObj, object orderStateObj, object outIdObj, object opTypeObj)
+        {
+            bool isCan = false;
+            int keyid = (int)keyidObj;
+            int orderState = (int)orderStateObj;
+            string opType = (string)opTypeObj;
+            int outId = (int)outIdObj;
+            if (orderState == -2)
+            {
+                return false;
+            }
+            if (opType == "鍥炶" || opType == "璇勪环" || opType == "鎶曡瘔")
+            {
+                if (orderState == 1)
+                {
+                    isCan = false;
+                }
+                else
+                {
+                    isCan = true;
+                }
+            }
+            else
+            {
+                if (outId > 0)
+                {
+                    return false;
+                }
+                if (orderState == 0)
+                {
+                    isCan = false;
+                }
+                else if (orderState == -1)
+                {
+                    if (opType != "閫佽揣")
+                    {
+                        isCan = false;
+                    }
+                    else
+                    {
+                        isCan = true;
+                    }
+                }
+                else
+                {
+                    if (opType == "鍙楃悊")
+                    {
+                        if (orderState == 1)
+                        {
+                            isCan = true;
+                        }
+                    }
+                    else
+                    {
+                        if (orderState == 1)
+                        {
+                            isCan = false;
+                        }
+                        else
+                        {
+                            if (opType == "鎾ゅ崟")
+                            {
+                                if (orderState == 4 || orderState == 5)
+                                {
+                                    isCan = false;
+                                }
+                                else
+                                {
+                                    isCan = true;
+                                }
+                            }
+                            else
+                            {
+                                isCan = true;
+                            }
+                        }
+                    }
+                }
+            }
+            return isCan;
+        }
+
+        /// <summary>
+        /// 鏄惁宸茬粡鎿嶄綔
+        /// </summary>
+        /// <param name="keyid"></param>
+        /// <param name="orderState"></param>
+        /// <param name="opType"></param>
+        /// <returns></returns>
+        public bool IsOpearted(object keyidObj, object orderStateObj, object opTypeObj)
+        {
+            int keyid = (int)keyidObj;
+            int orderState = (int)orderStateObj;
+            string opType = (string)opTypeObj;
+            return _eC_OrderBasicBLL.IsOpearted(keyid, orderState, opType);
+        }
+
+        /// <summary>
+        /// 鎵归噺鍘婚櫎璁㈠崟
+        /// </summary>
+        public void AcceptAll2()
+        {
+            Response.Clear();
+
+            string ids = string.Empty;
+
+            if (Request["ids"] != null)
+            {
+                ids = Request["ids"].ToString();
+            }
+
+
+            string[] idsArray = ids.Split(',');
+            using (TransactionScope scope = new TransactionScope())
+            {
+                if (idsArray != null && idsArray.Length > 0)
+                {
+                    for (int i = 0; i < idsArray.Length; i++)
+                    {
+                        bool result = true;
+                        EC_OrderExtend model = new EC_OrderExtend();
+                        model.Keyid = idsArray[i].ToInt32();
+                        model.QuchudingdanCreater = CurrentUser.TrueMemberId;
+                        model.QuchudingdanTime = DateTime.Now;
+                        model.Quchudingdan = 1;
+
+                        result = _eC_OrderBLL.OldUpdateQuchudingdan(model);
+
+                        if (!result)
+                        {
+                            //Page_Load_Default();
+                            Response.Write("-2");
+                            return;
+                        }
+                    }
+                }
+
+                scope.Complete();
+            }
+
+
+            // Page_Load_Default();
+            Response.Write("1");
+
+
+
+        }
+
+
+        /// <summary>
+        /// 鎵归噺寮�绁ㄧ敵璇�
+        /// </summary>
+        public void AcceptAll3()
+        {
+            Response.Clear();
+
+            string ids = string.Empty;
+
+            if (Request["ids"] != null)
+            {
+                ids = Request["ids"].ToString();
+            }
+
+
+            string[] idsArray = ids.Split(',');
+            using (TransactionScope scope = new TransactionScope())
+            {
+
+                if (idsArray != null && idsArray.Length > 0)
+                {
+                    DateTime kaipiaoshenqing = DateTime.Now;
+                    for (int i = 0; i < idsArray.Length; i++)
+                    {
+                        bool result = true;
+                        EC_OrderExtend model = new EC_OrderExtend();
+                        model.Keyid = idsArray[i].ToInt32();
+                        model.KaipiaoshenqingCreater = CurrentUser.TrueMemberId;
+                        model.KaipiaoshenqingTime = kaipiaoshenqing;
+                        model.Kaipiaoshenqing = 1;
+
+                        result = _eC_OrderBLL.OldUpdateKaipiaoshenqing(model);
+
+                        if (!result)
+                        {
+                            //Page_Load_Default();
+                            Response.Write("-2");
+                            return;
+                        }
+                    }
+                }
+
+                scope.Complete();
+            }
+
+
+            // Page_Load_Default();
+            Response.Write("1");
+
+
+
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/Baozhengjinfukuan.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/Baozhengjinfukuan.aspx.designer.cs
new file mode 100644
index 0000000..438b727
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/Baozhengjinfukuan.aspx.designer.cs
@@ -0,0 +1,143 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+//     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝g‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠g爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.business
+{
+
+
+    public partial class Baozhengjinfukuan
+    {
+
+        /// <summary>
+        /// Head1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
+
+        /// <summary>
+        /// CMSHead1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
+
+        /// <summary>
+        /// form1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// txtSQBeginDate 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText txtSQBeginDate;
+
+        /// <summary>
+        /// txtSQEndDate 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText txtSQEndDate;
+
+        /// <summary>
+        /// dwAcoountType 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.DropDownList dwAcoountType;
+
+        /// <summary>
+        /// selAccountName 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect selAccountName;
+
+        /// <summary>
+        /// Shoukuandanwei 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText Shoukuandanwei;
+
+        /// <summary>
+        /// remark 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText remark;
+
+        /// <summary>
+        /// TuikuanStatus 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect TuikuanStatus;
+
+        /// <summary>
+        /// btn_Search 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Button btn_Search;
+
+        /// <summary>
+        /// rptData 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Repeater rptData;
+
+        /// <summary>
+        /// heji 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl heji;
+
+        /// <summary>
+        /// UCPager1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::CY.WebForm.Pages.common.UCPager UCPager1;
+    }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/BaozhengjinIncome.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/financial/BaozhengjinIncome.aspx
new file mode 100644
index 0000000..b19a5df
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/BaozhengjinIncome.aspx
@@ -0,0 +1,166 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="BaozhengjinIncome.aspx.cs" Inherits="CY.WebForm.Pages.financial.BaozhengjinIncome" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head id="Head1" runat="server">
+    <title>澶栧崗浠樻</title>
+    <uc:CMSHead ID="CMSHead1" runat="server" />
+    <link href="../../Styles/ParticularWQJ.css" rel="stylesheet" type="text/css" />
+    <style type="text/css">
+        .table2 td{ text-align:left; padding:3px 2px;}
+    </style>
+    <script type="text/javascript">
+
+        var accountsTypes = false;
+        var accounts = false;
+
+        $(function () {
+            if ('1' == document.getElementById('txtResult').value) {
+                CloseOpenWindow(true);
+                return;
+            } else;
+            /*document.getElementById('txtReceiveDate').value = new Date().ToString("yyyy-MM-dd HH:mm");*/
+            //document.getElementById('txtReceiveMoney').value = document.getElementById('txtReciveMoney').value;
+           /* document.getElementById('txtReceiveMoney').focus();*/
+            accountsTypes = '<%=Request.RequestContext.RouteData.DataTokens["accountsTypes"] %>';
+            accounts = '<%=Request.RequestContext.RouteData.DataTokens["accounts"] %>';
+
+            try {
+                accountsTypes = eval(accountsTypes);
+                accounts = eval(accounts)[0];
+            } catch (e) {
+                accountsTypes = 'object' == typeof (accountsTypes) ? accountsTypes : [];
+                accounts = [];
+            }
+
+        });
+
+        /*
+        楠岃瘉杈撳叆浠锋牸
+        */
+        function ValidateInputPrice(txt) {
+            if (!ValidateDecimal(txt)) return; else;
+            try {
+                var inputPrice = parseFloat(txt.value);
+                var unPayed = parseFloat(document.getElementById('txtReciveMoney').value);
+                txt.value = isNaN(inputPrice) || isNaN(unPayed) ? 0 : txt.value;
+                if (inputPrice > unPayed) { alertMsg(' 鏈鏀舵閲戦澶т簬璁㈠崟鏈粯娆�!<br/>涓轰簡鎮ㄧ殑璐﹀姟姝g‘鎬ц閲嶆柊澶嶆煡锛�'); }
+            } catch (e) {
+
+            }
+        }
+    </script>
+</head>
+<body style='margin: 0; padding: 0;'>
+    <form id="form1" runat="server" onsubmit="if(false)return false;">
+    <input type="hidden" id='txtResult' value='<%=Request.RequestContext.RouteData.DataTokens["IsWin"] %>'>
+    <table class="tableStyle" style="margin: 5px 0;">
+        
+         
+        
+         <tr>
+            <td class="ali03 ">
+                鏀跺彇閲戦锛�
+            </td>
+            <td >
+                <asp:TextBox TextMode="SingleLine"  id="txtMoney" runat="server" class="req float" min="0" ReadOnly="true"   ></asp:TextBox>
+                  <input type="hidden"  id="Keyid" runat="server" />
+            </td>
+        </tr>
+       
+            
+           
+            <tr>
+               <%-- <td style=" text-align:right;">
+                    浠樻鏂瑰紡锛�
+                </td>
+                <td colspan="5">
+                    <input type="radio" name='rdoReceiveWay' id='rdoReceiveWay0' value='0' checked="checked" /><label for='rdoReceiveWay0'>棰勪粯娆�</label>
+                    (鍓╀綑棰勪粯娆撅細<span id="nowCustomMoney" runat="server" class="moneystyle"></span>)
+                </td>--%>
+                <td class="ali03 ">
+                    璐︽埛绫诲瀷锛�
+                </td>
+                <td>
+                    <select class="Sreq" id="selAcoountType" runat="server" datatextfield="Name" datavaluefield="Name" onchange="ChangeThisType(this);" keepdefaultstyle="true" msg="璇烽�夋嫨璐︽埛绫诲瀷">
+                    </select>
+                </td>
+                </tr>
+            <tr>
+                <td class="ali03 ">
+                    璐︽埛鍚嶇О锛�
+                </td>
+                <td>
+                    <select class="Sreq" id="selAccountName" runat="server" datatextfield="AccountName" datavaluefield="Keyid" keepdefaultstyle="true" msg="璇烽�夋嫨璐︽埛鍚嶇О">
+                        <option value="">璇烽�夋嫨</option>
+                    </select>
+                </td>
+                </tr>
+            <tr>
+                <td class="ali03 ">
+                    绉戠洰鍚嶇О锛�
+                </td>
+                <td>
+                    <select id="selSubject" runat="server" datatextfield="SubjectName" datavaluefield="Keyid" keepdefaultstyle="true" msg="璇烽�夋嫨绉戠洰鍚嶇О">
+                    </select>
+                </td>
+            </tr>
+          <tr>
+            <td class="ali03 ">
+                浜ゆ鍗曚綅锛�
+            </td>
+            <td >
+                <asp:TextBox TextMode="SingleLine"  id="txtPaymentUnit" runat="server" class="req float" min="0" ReadOnly="true"   ></asp:TextBox>
+            </td>
+        </tr>
+            
+            <tr>
+                <td style=" text-align:right;">
+                    鎽樿锛�
+                </td>
+                <td   align="left">
+                    <textarea id='txtOperationalMatters' runat="server" onblur='Restrict(this,200)' class='remark' style='height: 30px; width: 440px;'></textarea>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                </td>
+                <td   align="left">
+                <input type="button" value="纭浠樻" runat="server"   id='btnSubmit' /> 
+                </td>
+            </tr>
+    </table>
+    </form>
+     <script language="javascript" type="text/javascript">
+         function ChangeThisType(obj) {
+             $("#selAccountName").html("<option value=''>璇烽�夋嫨</option>");
+             $.ajax({
+                 url: "/Pages/financial/BaozhengjinIncome.aspx",
+                 type: "POST",
+                 dataType: "html",
+                 data: { TypeName: $(obj).val(), DataType: "change" },
+                 global: false,
+                 cache: false,
+                 success: function (data) {
+                     var myobj = eval('(' + data + ')');
+                     if (myobj != null && myobj.length > 0) {
+                         for (var i = 0; i < myobj.length; i++) {
+                             var city_keyid = myobj[i].Keyid;
+                             var city_name = myobj[i].AccountName + "-" + myobj[i].UserName;
+                             var option = "";
+                             option = "<option value = '" + city_keyid + "'>" + city_name + "</option>";
+                             $(option).appendTo($("#selAccountName"));
+                         }
+                     }
+                 }
+             });
+         }
+            
+    </script>
+    <script type="text/javascript">
+        $(function () {
+            ChangeThisType("#selAcoountType");
+        });
+    </script>
+</body>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/BaozhengjinIncome.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/BaozhengjinIncome.aspx.cs
new file mode 100644
index 0000000..69e8736
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/BaozhengjinIncome.aspx.cs
@@ -0,0 +1,287 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using CY.BLL.EC;
+using CY.Infrastructure.Common;
+using CY.Model;
+using CY.BLL.OA;
+using CY.BLL.Sys;
+using System.Text;
+using CY.BLL;
+using System.Data;
+using System.Transactions;
+
+namespace CY.WebForm.Pages.financial
+{
+    //鍚磋緣
+    //澶栧崗棰勪粯娆�
+    public partial class BaozhengjinIncome : BasePage
+    {
+        private EC_OrderBasicBLL _eC_OrderBasicBLL = null;
+        private OA_CorporateClientsBLL bll_OA_CorporateClientsBLL = null;
+        OA_FirmAccountBLL _OA_FirmAccountBLL = null;
+        OA_FirmAccountRecordBLL _OA_FirmAccountRecordBLL = null;
+        OA_FirmAccountRecord firmAccountRecord = null;
+        OA_FirmAccount firmAccount = null;
+        OA_BaozhengjinBLL oA_BaozhengjinBLL = null;
+        string orderNo = string.Empty;
+
+        decimal? AllMoney = 0;
+        decimal? ReceiveMoney = 0;
+
+        /// <summary>
+        /// 鍒濆鍖栨瀯閫� 
+        /// </summary>
+        public BaozhengjinIncome()
+        {
+            bll_OA_CorporateClientsBLL = new OA_CorporateClientsBLL();
+            _OA_FirmAccountBLL = new OA_FirmAccountBLL();
+            firmAccountRecord = new OA_FirmAccountRecord();
+            _OA_FirmAccountRecordBLL = new OA_FirmAccountRecordBLL();
+            oA_BaozhengjinBLL = new OA_BaozhengjinBLL();
+        }
+
+        /// <summary>
+        /// 鐣岄潰鍔犺浇浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            _eC_OrderBasicBLL = new EC_OrderBasicBLL();
+            btnSubmit.ServerClick += new EventHandler(btnSubmit_ServerClick);
+            try
+            {
+                switch (Request["DataType"])
+                {
+                    case "change":
+                        Response.Write(reLoadAccountName(Request["TypeName"].ToString2()));
+                        break;
+                    default://涓�鑸儏鍐典笉澶勭悊
+                        if (IsPostBack || IsCallback)
+                            return;
+                        else
+                        {
+                            LoadOrder();
+                            InitialData();
+                        }
+                        return;
+                }
+            }
+            catch (Exception ex)
+            {
+                PAGEHandleException(ex);
+                Response.Clear();
+                Response.Write("-1");
+            }
+            Response.End();
+            InitPage();
+
+        }
+        protected void InitialData()
+        {
+            //绉戠洰鍚嶇О
+            Sys_DictionaryBLL _Sys_DictionaryBLL = new Sys_DictionaryBLL();
+            OA_SubjectSetBLL _OA_SubjectSetBLL = new OA_SubjectSetBLL();
+            OA_FirmAccountBLL oA_FirmAccountBLL = new OA_FirmAccountBLL();
+            selSubject.DataSource = _OA_SubjectSetBLL.getAllSubject(CurrentUser.MemberId, "鍊�");
+            selSubject.DataBind();
+            selSubject.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+
+            ///璐︽埛绫诲瀷
+            
+            selAcoountType.DataSource = _Sys_DictionaryBLL.GetDataByType("璐︽埛绫诲瀷");   
+           
+            selAcoountType.DataBind();
+
+            //selAcoountType_SelectedIndexChanged(null, null);
+
+        }
+        protected string reLoadAccountName(string selAcoountType)
+        {
+            return JsonHelper.GetJsonStringByObject(_OA_FirmAccountBLL.getAllSubject(CurrentUser.MemberId, selAcoountType));
+        }
+        /// <summary>
+        /// 鎻愪氦鎸夐挳鐐瑰嚮浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void btnSubmit_ServerClick(object sender, EventArgs e)
+        {
+
+            
+            
+            //_orderBasic = new EC_OrderBasic();
+            _eC_OrderBasicBLL = new EC_OrderBasicBLL();
+            //_orderBasic = _eC_OrderBasicBLL.SelectModelById(orderId.Value);
+            //string orderno = "";
+            //string sellerName = "";
+            if(string.IsNullOrEmpty(Request["selAccountName"]))
+            {
+                JavaScript.MessageBox("璇烽�夋嫨璐︽埛", this);
+                return;
+            }
+            firmAccount = _OA_FirmAccountBLL.getSingleSubject(Request["selAccountName"].ToInt32());
+            
+
+            var ssss = false;
+
+            var id = this.Keyid.Value.ToInt32().Value;
+            var fukuanshenqing = oA_BaozhengjinBLL.GetModelByKeyid(id);
+            
+            if (fukuanshenqing.TuikuanStatus == 2 )
+            {
+                JavaScript.MessageBox("宸茬粡閫�娆撅紝鏃犳硶閲嶅閫�娆撅紒", this);
+                return;
+            }
+           
+            using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required,
+    new TransactionOptions
+    {
+        IsolationLevel = System.Transactions.IsolationLevel.ReadCommitted,
+        Timeout = TransactionManager.MaximumTimeout
+    }
+    ))
+            {
+                try
+                {
+
+
+
+                    fukuanshenqing.TuikuanStatus = 2;
+                    fukuanshenqing.TuikuanTime = DateTime.Now;
+                    
+                    fukuanshenqing.Updater = CurrentUser.ShortName;
+                    fukuanshenqing.LastUpdateTime = DateTime.Now;
+                    ssss = oA_BaozhengjinBLL.UpdateModel(fukuanshenqing);
+                    if(this.txtMoney.Text.ToDecimal2() > 0)
+                    {
+                        firmAccount = _OA_FirmAccountBLL.getSingleSubject(Request["selAccountName"].ToInt32());
+                        OA_FirmAccountRecord firmAccountRecord = new OA_FirmAccountRecord() ;
+                        firmAccountRecord.AccountId = Request["selAccountName"].ToInt32();
+                        firmAccountRecord.LastUpdateTime = DateTime.Now;
+                        firmAccountRecord.Money = txtMoney.Text.ToDecimal2();
+                        firmAccountRecord.OperationalMatters = txtOperationalMatters.Value;
+                        firmAccountRecord.Operator = CurrentUser.ShortName;
+                        firmAccountRecord.PaymentUnit = txtPaymentUnit.Text;
+                        firmAccountRecord.RecordTypeId = 1;//鏀跺叆
+                        firmAccountRecord.Remark = "";
+                        firmAccountRecord.SubjectId = selSubject.Value.ToInt32();
+                        firmAccountRecord.ResidualAmount = firmAccount.Balance + txtMoney.Text.ToDecimal2();
+                        firmAccountRecord.Department = "";
+
+                        firmAccount.AllIncome = txtMoney.Text.ToDecimal2() + firmAccount.AllIncome;
+                        firmAccount.Balance = firmAccount.Balance + txtMoney.Text.ToDecimal2();
+
+                        ssss = _OA_FirmAccountRecordBLL.AddModel(firmAccountRecord, firmAccount);
+                    }
+
+
+                 
+
+                    
+
+                    if (ssss)
+                    {
+                        
+                        scope.Complete();
+                        JavaScript.MessageBox("浠樻鎴愬姛", this, "top.frmright.ReLoad();top.Dialog.close();");
+                    }
+                    else
+                        JavaScript.MessageBox("娣诲姞澶辫触", this);
+                }
+                catch (Exception ex)
+                {
+                    PAGEHandleException(ex);
+                    JavaScript.MessageBox("娣诲姞澶辫触", this);
+                }
+                finally
+                {
+                    scope.Dispose();
+                }
+
+
+            }
+
+
+
+
+
+        }
+
+        /// <summary>
+        /// 鍔犺浇椤甸潰鏁版嵁
+        /// </summary>
+        private void InitPage()
+        {
+            try
+            {
+                Sys_DictionaryBLL _Sys_DictionaryBLL = new Sys_DictionaryBLL();
+                //OA_SubjectSetBLL _OA_SubjectSetBLL = new OA_SubjectSetBLL();
+                OA_FirmAccountBLL oA_FirmAccountBLL = new OA_FirmAccountBLL();               
+
+                int i = -1;
+                //璐︽埛绫诲瀷
+                List<Sys_Dictionary> accountsType = _Sys_DictionaryBLL.GetDataByType("璐︽埛绫诲瀷") as List<Sys_Dictionary>;
+                Request.RequestContext.RouteData.DataTokens.Add("accountsTypes", null == accountsType || accountsType.Count == 0 ? "[]" : JsonHelper.GetJsonStringByObject(accountsType));
+
+                List<OA_FirmAccount> firmAccounts = oA_FirmAccountBLL.getAllSubject(CurrentUser.MemberId, "") as List<OA_FirmAccount>;
+
+                const string ACCOUNTSJSONKEY = "accounts";
+                if (null == firmAccounts)
+                {
+                    Request.RequestContext.RouteData.DataTokens.Add(ACCOUNTSJSONKEY, "[]");
+                    return;
+                }
+
+                IEnumerable<IGrouping<string, OA_FirmAccount>> groupings = firmAccounts.GroupBy(fa => fa.AccountType);
+                StringBuilder builder = new StringBuilder();
+
+                foreach (IGrouping<string, OA_FirmAccount> groupitem in groupings)
+                {
+                    OA_FirmAccount[] items = groupitem.ToArray();
+                    builder.AppendFormat("{0}\"{2}\":{3}{1}", ",", "", groupitem.Key, JsonHelper.GetJsonStringByObject(items));
+                }
+                builder.Append("}]");
+                builder.Replace(",", "[{", 0, 1);
+
+                Request.RequestContext.RouteData.DataTokens.Add(ACCOUNTSJSONKEY, null == firmAccounts ? "[]" : builder.ToString());
+
+            }
+            catch (Exception ex)
+            {
+                PAGEHandleException(ex);
+            }
+        }
+
+        /// <summary>
+        /// 鍔犺浇璁㈠崟
+        /// </summary>
+        private void LoadOrder()
+        {
+            var id = Request["id"];
+            var fukuanshenqing = oA_BaozhengjinBLL.GetModelByKeyid(id.ToInt32().Value);
+            if (fukuanshenqing != null)
+            {
+                this.Keyid.Value = id;
+
+
+                
+
+                this.txtMoney.Text = fukuanshenqing.Fukuanmoney.Value.ToString("0.00");
+                this.txtPaymentUnit.Text = fukuanshenqing.Shoukuandanwei;
+                this.txtOperationalMatters.Value = fukuanshenqing.remark;
+            }
+           
+
+           
+          
+        }
+        
+        
+  
+    }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/BaozhengjinIncome.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/BaozhengjinIncome.aspx.designer.cs
new file mode 100644
index 0000000..82a487b
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/BaozhengjinIncome.aspx.designer.cs
@@ -0,0 +1,116 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+//     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝g‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠g爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.financial
+{
+
+
+    public partial class BaozhengjinIncome
+    {
+
+        /// <summary>
+        /// Head1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
+
+        /// <summary>
+        /// CMSHead1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
+
+        /// <summary>
+        /// form1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// txtMoney 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox txtMoney;
+
+        /// <summary>
+        /// Keyid 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputHidden Keyid;
+
+        /// <summary>
+        /// selAcoountType 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect selAcoountType;
+
+        /// <summary>
+        /// selAccountName 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect selAccountName;
+
+        /// <summary>
+        /// selSubject 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect selSubject;
+
+        /// <summary>
+        /// txtPaymentUnit 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox txtPaymentUnit;
+
+        /// <summary>
+        /// txtOperationalMatters 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlTextArea txtOperationalMatters;
+
+        /// <summary>
+        /// btnSubmit 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputButton btnSubmit;
+    }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/FirmAccountExpensesEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/financial/FirmAccountExpensesEdit.aspx
index ccf78fb..c7383b5 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/FirmAccountExpensesEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/FirmAccountExpensesEdit.aspx
@@ -34,9 +34,24 @@
                     绉戠洰鍚嶇О锛�
                 </td>
                 <td>
-                    <select id="selSubject" runat="server" datatextfield="SubjectName" datavaluefield="Keyid" keepdefaultstyle="true" msg="璇烽�夋嫨绉戠洰鍚嶇О">
+                    <select id="selSubject" runat="server" datatextfield="SubjectName" datavaluefield="Keyid" keepdefaultstyle="true" msg="璇烽�夋嫨绉戠洰鍚嶇О" onchange="ChangeThisSubject(this);" >
                     </select>
                 </td>
+            </tr>
+            <tr id="shenqingren" style="display:none;">
+                <td class="ali03 ">
+                    鐢宠浜猴細
+                </td>
+                <td>
+                    <select id="selshenqingren" runat="server"  datavaluefield="Keyid" datatextfield='Name' keepdefaultstyle="true" msg="璇烽�夋嫨鐢宠浜�"   >
+                    </select>
+                </td>
+            </tr>
+            <tr id="shenqingrenss" style="display:none;">
+                <td  colspan="2">
+                   <span  style="color:red;">閫夋嫨绉戠洰锛氭姇鏍囦繚璇侀噾锛屽饱绾︿繚璇侀噾锛屽皢浼氫骇鐢熶竴鏉′繚璇侀噾鏁版嵁锛�</span>
+                </td>
+                
             </tr>
             <tr>
                 <td class="ali03 ">
@@ -89,6 +104,22 @@
     </div>
     </form>
     <script language="javascript" type="text/javascript">
+
+
+        function ChangeThisSubject(obj) {
+            
+
+            var selectedText = $(obj).find("option:selected").text();
+            if (selectedText.indexOf("鎶曟爣淇濊瘉閲�") >= 0 || selectedText.indexOf("灞ョ害淇濊瘉閲�") >= 0) {
+                $("#shenqingren").show();
+                $("#shenqingrenss").show();
+            } else {
+                $("#shenqingren").hide();
+                $("#shenqingrenss").hide();
+            }
+        }
+
+
         function ChangeThisType(obj) {
             $("#selAccountName").html("<option value=''>璇烽�夋嫨</option>");
             $.ajax({
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/FirmAccountExpensesEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/FirmAccountExpensesEdit.aspx.cs
index ca7ca90..1c8fcd6 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/FirmAccountExpensesEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/FirmAccountExpensesEdit.aspx.cs
@@ -8,6 +8,7 @@
 using CY.Infrastructure.Common;
 using CY.BLL.OA;
 using CY.BLL.Sys;
+using CY.BLL;
 
 namespace CY.WebForm.Pages.financial
 {
@@ -19,7 +20,8 @@
         OA_FirmAccountRecordBLL _OA_FirmAccountRecordBLL = null;
         OA_FirmAccountRecord firmAccountRecord = null;
         OA_FirmAccount firmAccount = null;
-
+        OA_BaozhengjinBLL oA_BaozhengjinBLL = null;
+        OA_StaffBLL staffBLL = null;
         public FirmAccountExpensesEdit()
         {
             firmAccount = new OA_FirmAccount();
@@ -28,6 +30,8 @@
             _OA_FirmAccountRecordBLL = new OA_FirmAccountRecordBLL();
             _OA_SubjectSetBLL = new OA_SubjectSetBLL();
             firmAccountRecord = new OA_FirmAccountRecord();
+            oA_BaozhengjinBLL = new OA_BaozhengjinBLL();
+            staffBLL = new OA_StaffBLL();
         }
 
         protected void Page_Load(object sender, EventArgs e)
@@ -68,6 +72,9 @@
             ///璐︽埛绫诲瀷
             selAcoountType.DataSource = _Sys_DictionaryBLL.GetDataByType("璐︽埛绫诲瀷");
             selAcoountType.DataBind();
+
+            selshenqingren.DataSource =  staffBLL.SelectListByFirmId(CurrentUser.MemberId,null, null).Where(x => x.DepartmentId == 2);
+            selshenqingren.DataBind();
         }
 
         protected string reLoadAccountName(string selAcoountType)
@@ -79,6 +86,8 @@
         {
             try
             {
+               // selshenqingren
+
                 firmAccount = _OA_FirmAccountBLL.getSingleSubject(Request["selAccountName"].ToInt32());
 
                 firmAccountRecord.AccountId = Request["selAccountName"].ToInt32();
@@ -98,6 +107,53 @@
 
                 if (_OA_FirmAccountRecordBLL.AddModel(firmAccountRecord, firmAccount))
                 {
+                    if (!string.IsNullOrEmpty(this.selSubject.Value))
+                    {
+                        var oA_SubjectSet = _OA_SubjectSetBLL.getSingleSubject(firmAccountRecord.SubjectId);
+                        if (oA_SubjectSet.SubjectName.IndexOf("鎶曟爣淇濊瘉閲�") >= 0 || oA_SubjectSet.SubjectName.IndexOf("灞ョ害淇濊瘉閲�") >= 0)
+                        {
+                            //濡傛灉閫夋嫨绉戠洰鏄繚璇侀噾锛屾彃鍏ヤ互鏉′繚璇侀噾鏁版嵁
+                            OA_Baozhengjin oA_Baozhengjin = new OA_Baozhengjin();
+                            oA_Baozhengjin.FirmId = CurrentUser.MemberId;
+                            oA_Baozhengjin.FukuanTime = DateTime.Now;
+
+                            oA_Baozhengjin.Zhanghuleixing = this.selAcoountType.Value;
+
+                            var ss = _Sys_DictionaryBLL.GetDataByType("璐︽埛绫诲瀷").FirstOrDefault(x => x.Name == oA_Baozhengjin.Zhanghuleixing);
+                            if (ss != null)
+                            {
+                                oA_Baozhengjin.ReceiveWay = ss.Keyid;
+                            }
+
+                            oA_Baozhengjin.Account = Request["selAccountName"].ToInt32();
+                            oA_Baozhengjin.Fukuanzhanghu = firmAccount.AccountName + "-" + firmAccount.UserName;
+                            oA_Baozhengjin.Subject = firmAccountRecord.SubjectId;
+                            oA_Baozhengjin.Fukuankemu = oA_SubjectSet.SubjectName;
+                            oA_Baozhengjin.Fukuanmoney = firmAccountRecord.Money;
+                            oA_Baozhengjin.Shoukuandanwei = firmAccountRecord.PaymentUnit;
+                            oA_Baozhengjin.remark = firmAccountRecord.OperationalMatters;
+                            oA_Baozhengjin.TuikuanTime = null;
+
+                            oA_Baozhengjin.TuikuanStatus = 1;
+                            oA_Baozhengjin.Creater = CurrentUser.ShortName;
+                            oA_Baozhengjin.CreateTime = oA_Baozhengjin.FukuanTime;
+                            oA_Baozhengjin.Updater = CurrentUser.ShortName;
+                            oA_Baozhengjin.LastUpdateTime = oA_Baozhengjin.FukuanTime;
+                            oA_Baozhengjin.MemberId = this.selshenqingren.Value.ToInt32();
+                            if(oA_Baozhengjin.MemberId.HasValue && oA_Baozhengjin.MemberId.Value > 0)
+                            {
+                                var aaa = staffBLL.GetModelByKeyid(oA_Baozhengjin.MemberId);
+                                if (aaa != null)
+                                {
+                                    oA_Baozhengjin.MemberName = aaa.Name;
+                                }
+                            }
+
+                            var sss = oA_BaozhengjinBLL.InsertModel(oA_Baozhengjin);
+
+                        }
+                    }
+                   
                     this.selSubject.Value = "";
                     this.txtMoney.Value = "";
                     this.txtDepartment.Value = "";
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/FirmAccountExpensesEdit.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/FirmAccountExpensesEdit.aspx.designer.cs
index 4c73b0f..cdfa431 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/FirmAccountExpensesEdit.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/FirmAccountExpensesEdit.aspx.designer.cs
@@ -2,16 +2,18 @@
 // <鑷姩鐢熸垚>
 //     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
 //
-//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-//     閲嶆柊鐢熸垚浠g爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便�� 
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝g‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠g爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
 // </鑷姩鐢熸垚>
 //------------------------------------------------------------------------------
 
-namespace CY.WebForm.Pages.financial {
-    
-    
-    public partial class FirmAccountExpensesEdit {
-        
+namespace CY.WebForm.Pages.financial
+{
+
+
+    public partial class FirmAccountExpensesEdit
+    {
+
         /// <summary>
         /// CMSHead1 鎺т欢銆�
         /// </summary>
@@ -20,7 +22,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
-        
+
         /// <summary>
         /// form1 鎺т欢銆�
         /// </summary>
@@ -29,7 +31,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// selAcoountType 鎺т欢銆�
         /// </summary>
@@ -38,7 +40,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlSelect selAcoountType;
-        
+
         /// <summary>
         /// selAccountName 鎺т欢銆�
         /// </summary>
@@ -47,7 +49,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlSelect selAccountName;
-        
+
         /// <summary>
         /// selSubject 鎺т欢銆�
         /// </summary>
@@ -56,7 +58,16 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlSelect selSubject;
-        
+
+        /// <summary>
+        /// selshenqingren 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect selshenqingren;
+
         /// <summary>
         /// txtMoney 鎺т欢銆�
         /// </summary>
@@ -65,7 +76,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtMoney;
-        
+
         /// <summary>
         /// txtDepartment 鎺т欢銆�
         /// </summary>
@@ -74,7 +85,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtDepartment;
-        
+
         /// <summary>
         /// txtPaymentUnit 鎺т欢銆�
         /// </summary>
@@ -83,7 +94,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtPaymentUnit;
-        
+
         /// <summary>
         /// txtOperationalMatters 鎺т欢銆�
         /// </summary>
@@ -92,7 +103,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlTextArea txtOperationalMatters;
-        
+
         /// <summary>
         /// txtRemark 鎺т欢銆�
         /// </summary>
@@ -101,7 +112,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlTextArea txtRemark;
-        
+
         /// <summary>
         /// btn_Submit 鎺т欢銆�
         /// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/FirmAccountExpensesList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/financial/FirmAccountExpensesList.aspx
index b804618..e06ae70 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/FirmAccountExpensesList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/FirmAccountExpensesList.aspx
@@ -8,7 +8,7 @@
     <script type="text/javascript">
         ///娣诲姞
         function addModel() {
-            top.Dialog.open({ URL: "/Pages/financial/FirmAccountExpensesEdit.aspx?Keyid='0'", Title: "鏂板鏀嚭璁板綍", Width: 420, Height: 270 });
+            top.Dialog.open({ URL: "/Pages/financial/FirmAccountExpensesEdit.aspx?Keyid='0'", Title: "鏂板鏀嚭璁板綍", Width: 420, Height: 370 });
         }
         //鏌ョ湅
         function onView(keyid) {
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/FirmAccountExpensesList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/FirmAccountExpensesList.aspx.designer.cs
index b8216cf..934f681 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/FirmAccountExpensesList.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/FirmAccountExpensesList.aspx.designer.cs
@@ -2,16 +2,18 @@
 // <鑷姩鐢熸垚>
 //     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
 //
-//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-//     閲嶆柊鐢熸垚浠g爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便�� 
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝g‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠g爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
 // </鑷姩鐢熸垚>
 //------------------------------------------------------------------------------
 
-namespace CY.WebForm.Pages.financial {
-    
-    
-    public partial class FirmAccountExpensesList {
-        
+namespace CY.WebForm.Pages.financial
+{
+
+
+    public partial class FirmAccountExpensesList
+    {
+
         /// <summary>
         /// CMSHead1 鎺т欢銆�
         /// </summary>
@@ -20,7 +22,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
-        
+
         /// <summary>
         /// form1 鎺т欢銆�
         /// </summary>
@@ -29,7 +31,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// txtRegTimeStart 鎺т欢銆�
         /// </summary>
@@ -38,7 +40,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtRegTimeStart;
-        
+
         /// <summary>
         /// txtRegTimeEnd 鎺т欢銆�
         /// </summary>
@@ -47,7 +49,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtRegTimeEnd;
-        
+
         /// <summary>
         /// dwAcountType 鎺т欢銆�
         /// </summary>
@@ -56,7 +58,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.WebControls.DropDownList dwAcountType;
-        
+
         /// <summary>
         /// selAccountName 鎺т欢銆�
         /// </summary>
@@ -65,7 +67,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlSelect selAccountName;
-        
+
         /// <summary>
         /// selSubject 鎺т欢銆�
         /// </summary>
@@ -74,7 +76,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlSelect selSubject;
-        
+
         /// <summary>
         /// txtOperationalMatters 鎺т欢銆�
         /// </summary>
@@ -83,7 +85,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtOperationalMatters;
-        
+
         /// <summary>
         /// txtPaymentUnit 鎺т欢銆�
         /// </summary>
@@ -92,7 +94,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtPaymentUnit;
-        
+
         /// <summary>
         /// txtOperater 鎺т欢銆�
         /// </summary>
@@ -101,7 +103,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtOperater;
-        
+
         /// <summary>
         /// btn_Register 鎺т欢銆�
         /// </summary>
@@ -110,7 +112,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.WebControls.Button btn_Register;
-        
+
         /// <summary>
         /// RepFirmAccountIncomeList 鎺т欢銆�
         /// </summary>
@@ -119,7 +121,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.WebControls.Repeater RepFirmAccountIncomeList;
-        
+
         /// <summary>
         /// NowPageAllMoney 鎺т欢銆�
         /// </summary>
@@ -128,7 +130,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl NowPageAllMoney;
-        
+
         /// <summary>
         /// AllMoney 鎺т欢銆�
         /// </summary>
@@ -137,7 +139,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl AllMoney;
-        
+
         /// <summary>
         /// UCPager1 鎺т欢銆�
         /// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/FirmAccountIncomeList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/FirmAccountIncomeList.aspx.cs
index 96ae204..137cbb0 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/FirmAccountIncomeList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/FirmAccountIncomeList.aspx.cs
@@ -87,7 +87,7 @@
             ///璐︽埛绫诲瀷
             dwAcoountType.DataSource = _Sys_DictionaryBLL.GetDataByType("璐︽埛绫诲瀷");
             dwAcoountType.DataTextField = "Name";
-            dwAcoountType.DataValueField = "Keyid";
+            dwAcoountType.DataValueField = "Name";
             dwAcoountType.DataBind();
             dwAcoountType.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
 

--
Gitblit v1.9.1