From ba381be6a5aac58df11e2e7b6b19f012bd9ff5a1 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 04 十二月 2024 10:34:30 +0800
Subject: [PATCH] 开票申请
---
CY_ECommercePlatform/CY.BLL/CY.BLL.csproj | 3
CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingHuikuan.aspx.cs | 193 +
CY_ECommercePlatform/CY.IDAL/OA/IOA_KaipiaonewDAL.cs | 29
CY_ECommercePlatform/CY.Model/OA/OA_Kaipiaonewhuikuan.cs | 136 +
CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingCuishou.aspx | 115
CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestList.aspx.designer.cs | 36
CY_ECommercePlatform/CY.BLL/OA/OA_KaipiaoshenqingBLL.cs | 29
CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingApplyPrint.aspx.cs | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingHuikuan.aspx | 140 +
CY_ECommercePlatform/CY.BLL/EC/EC_OrderBLL.cs | 24
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderKehuqianshou.aspx | 137
CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx | 27
CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx.designer.cs | 54
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderKehuqianshou.aspx.cs | 141 +
CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingCuishou.aspx.cs | 182 +
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx.designer.cs | 170 +
CY_ECommercePlatform/CY.Model/CY.Model.csproj | 3
CY_ECommercePlatform/CY.IDAL/OA/IOA_KaipiaonewhuikuanDAL.cs | 29
CY_ECommercePlatform/CY.Model/OA/OA_Kaipiaonewcuishou.cs | 121
CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingApply.aspx.cs | 2
CY_ECommercePlatform/CY.Model/OA/OA_WorkPlan.cs | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx.designer.cs | 18
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx.cs | 891 +++++++
CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj | 32
CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderDAL.cs | 4
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx | 797 ++++++
CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs | 24
CY_ECommercePlatform/CY.Model/OA/OA_Kaipiaoshenqing.cs | 77
CY_ECommercePlatform/CY.SQLDAL/CY.SQLDAL.csproj | 3
CY_ECommercePlatform/CY.IDAL/CY.IDAL.csproj | 3
CY_ECommercePlatform/CY.BLL/OA/OA_KaipiaonewcuishouBLL.cs | 140 +
CY_ECommercePlatform/CY.Model/OA/OA_Kaipiaonew.cs | 486 +++
CY_ECommercePlatform/CY.SQLDAL/OA/OA_KaipiaonewcuishouDAL.cs | 234 +
CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx.designer.cs | 36
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx | 2
CY_ECommercePlatform/CY.SQLDAL/OA/OA_KipiaoshenqingDAL.cs | 33
CY_ECommercePlatform/CY.SQLDAL/OA/OA_KaipiaonewDAL.cs | 370 +++
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderDAL.cs | 76
CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingOrderPrint.aspx.cs | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirmEdit.aspx | 8
CY_ECommercePlatform/AbstractFactory/Factory.cs | 17
CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirmEdit.aspx.designer.cs | 18
CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx.cs | 75
CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingHuikuan.aspx.designer.cs | 134 +
CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx.cs | 7
CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingCuishou.aspx.designer.cs | 116
CY_ECommercePlatform/CY.IDAL/OA/IOA_KaipiaonewcuishouDAL.cs | 29
CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx.designer.cs | 34
CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs | 12
CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirmEdit.aspx.cs | 114
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderKehuqianshou.aspx.designer.cs | 62
CY_ECommercePlatform/CY.WebForm/Pages/financial/InvoicingShoukuan.aspx.cs | 567 ++++
CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx | 1
CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx | 153
CY_ECommercePlatform/CY.WebForm/Pages/financial/InvoicingShoukuan.aspx | 390 +++
CY_ECommercePlatform/CY.WebForm/MainPage.cs | 22
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx.cs | 4
CY_ECommercePlatform/CY.WebForm/Pages/financial/InvoicingShoukuan.aspx.designer.cs | 143 +
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx | 26
CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestList.aspx | 7
CY_ECommercePlatform/CY.BLL/OA/OA_KaipiaonewBLL.cs | 191 +
CY_ECommercePlatform/CY.BLL/OA/OA_KaipiaonewhuikuanBLL.cs | 138 +
CY_ECommercePlatform/CY.SQLDAL/OA/OA_KaipiaonewhuikuanDAL.cs | 236 +
CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx | 1
64 files changed, 6,992 insertions(+), 316 deletions(-)
diff --git a/CY_ECommercePlatform/AbstractFactory/Factory.cs b/CY_ECommercePlatform/AbstractFactory/Factory.cs
index c25303e..d430f6e 100644
--- a/CY_ECommercePlatform/AbstractFactory/Factory.cs
+++ b/CY_ECommercePlatform/AbstractFactory/Factory.cs
@@ -259,6 +259,9 @@
OBJECT_PATH.Add(DALInterface.IOA_WageAwardPunishDAL, "OA_WageAwardPunishDAL");
OBJECT_PATH.Add(DALInterface.IOA_DeliverPlanDAL, "OA_DeliverPlanDAL");
OBJECT_PATH.Add(DALInterface.IOA_KipiaoshenqingDAL, "OA_KipiaoshenqingDAL");
+ OBJECT_PATH.Add(DALInterface.IOA_KaipiaonewcuishouDAL, "OA_KaipiaonewcuishouDAL");
+ OBJECT_PATH.Add(DALInterface.IOA_KaipiaonewhuikuanDAL, "OA_KaipiaonewhuikuanDAL");
+ OBJECT_PATH.Add(DALInterface.IOA_KaipiaonewDAL, "OA_KaipiaonewDAL");
OBJECT_PATH.Add(DALInterface.ICoreCmsPlanOrderDAL, "CoreCmsPlanOrderDAL");
OBJECT_PATH.Add(DALInterface.ICoreCmsPlanOrderItemDAL, "CoreCmsPlanOrderItemDAL");
OBJECT_PATH.Add(DALInterface.IOA_YujihuikuanDAL, "OA_YujihuikuanDAL");
@@ -873,7 +876,19 @@
/// 寮�绁ㄧ敵璇�
/// </summary>
IOA_KipiaoshenqingDAL = 1131,
-
+ /// <summary>
+ /// 寮�绁ㄧ敵璇�
+ /// </summary>
+ IOA_KaipiaonewcuishouDAL = 1931,
+ /// <summary>
+ /// 寮�绁ㄧ敵璇�
+ /// </summary>
+ IOA_KaipiaonewhuikuanDAL = 1933,
+ /// <summary>
+ /// 寮�绁ㄧ敵璇�
+ /// </summary>
+ IOA_KaipiaonewDAL = 1932,
+
/// <summary>
/// 璁″垝璁㈠崟
/// </summary>
diff --git a/CY_ECommercePlatform/CY.BLL/CY.BLL.csproj b/CY_ECommercePlatform/CY.BLL/CY.BLL.csproj
index be53784..49f7f22 100644
--- a/CY_ECommercePlatform/CY.BLL/CY.BLL.csproj
+++ b/CY_ECommercePlatform/CY.BLL/CY.BLL.csproj
@@ -170,6 +170,9 @@
<Compile Include="OA\OA_DepartmentBLL.cs" />
<Compile Include="OA\OA_DocumentBLL.cs" />
<Compile Include="OA\OA_DocumentDicBLL.cs" />
+ <Compile Include="OA\OA_KaipiaonewBLL.cs" />
+ <Compile Include="OA\OA_KaipiaonewcuishouBLL.cs" />
+ <Compile Include="OA\OA_KaipiaonewhuikuanBLL.cs" />
<Compile Include="OA\OA_KaipiaoshenqingBLL.cs" />
<Compile Include="OA\OA_PropertyCateBLL.cs" />
<Compile Include="OA\OA_PropertyManageBLL.cs" />
diff --git a/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBLL.cs b/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBLL.cs
index 4f0574b..4b893c0 100644
--- a/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBLL.cs
@@ -300,6 +300,30 @@
/// 淇敼
/// </summary>
/// <param name="model"></param>
+ /// <param name="ids"></param>
+ /// <returns></returns>
+ public bool NewUpdateKaipiaoshenqings(EC_OrderExtend model)
+ {
+
+ return _iEC_OrderDAL.NewUpdateKaipiaoshenqings(model );
+ }
+
+ /// <summary>
+ /// 淇敼
+ /// </summary>
+ /// <param name="model"></param>
+ /// <param name="ids"></param>
+ /// <returns></returns>
+ public bool JujueKaipiaoshenqings(EC_OrderExtend model)
+ {
+
+ return _iEC_OrderDAL.JujueKaipiaoshenqings(model);
+ }
+
+ /// <summary>
+ /// 淇敼
+ /// </summary>
+ /// <param name="model"></param>
/// <returns></returns>
public bool OldUpdateKaipiaoqueren(EC_OrderExtend model)
{
diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_KaipiaonewBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_KaipiaonewBLL.cs
new file mode 100644
index 0000000..bcff6ad
--- /dev/null
+++ b/CY_ECommercePlatform/CY.BLL/OA/OA_KaipiaonewBLL.cs
@@ -0,0 +1,191 @@
+锘�
+/**
+* OA_KaipiaonewBLL.cs
+*
+* 鍔� 鑳斤細 鍚堜綔瀹㈡埛涓氬姟閫昏緫绫�
+* 绫� 鍚嶏細 OA_KaipiaonewBLL
+*
+* 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_KaipiaonewBLL
+ {
+ IOA_KaipiaonewDAL _IOA_KaipiaonewDAL = null;
+
+ /// <summary>
+ /// 鍒濆鍖栨瀯閫�
+ /// </summary>
+ public OA_KaipiaonewBLL()
+ {
+ //鑾峰彇OA_Kaipiaonew DAL瀹炵幇
+ _IOA_KaipiaonewDAL = Factory.GetDALByInterfaceName(DALInterface.IOA_KaipiaonewDAL) as IOA_KaipiaonewDAL;
+
+
+ }
+
+ /// <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_Kaipiaonew m_OA_Kaipiaonew)
+ {
+ try
+ {
+
+ return _IOA_KaipiaonewDAL.InserModel(m_OA_Kaipiaonew);
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
+ /// <summary>
+ /// 淇敼閫佽揣瀹夋帓
+ /// </summary>
+ /// <param name="rType"></param>
+ /// <returns></returns>
+ public bool UpdateModel(CY.Model.OA_Kaipiaonew m_OA_Kaipiaonew)
+ {
+ try
+ {
+ return _IOA_KaipiaonewDAL.UpdateModel(m_OA_Kaipiaonew);
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇鍏ㄩ儴鍚堜綔瀹㈡埛
+ /// </summary>
+ /// <param name="Keyid">涓婚敭id</param>
+ /// <returns></returns>
+ public IEnumerable<OA_Kaipiaonew> GetModelList()
+ {
+ Query query = new Query();
+ return _IOA_KaipiaonewDAL.SelectAllModel(query);
+ }
+
+
+ /// <summary>
+ /// 鏍规嵁SellerOrderId鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="SellerOrderId">缂栧彿</param>
+ /// <returns></returns>
+ public IEnumerable<Model.OA_Kaipiaonew> GetModelBySellerOrderId(int SellerOrderId)
+ {
+
+ return _IOA_KaipiaonewDAL.GetModelBySellerOrderId(SellerOrderId);
+ }
+
+ /// <summary>
+ /// 鑾峰彇鍏ㄩ儴鍚堜綔瀹㈡埛
+ /// </summary>
+ /// <param name="Keyid">涓婚敭id</param>
+ /// <returns></returns>
+ public OA_Kaipiaonew GetModelByKeyid(int keyid)
+ {
+
+ return _IOA_KaipiaonewDAL.GetModelByKeyid(keyid);
+ }
+
+ /// <summary>
+ /// 鍒犻櫎鍚堜綔瀹㈡埛
+ /// </summary>
+ /// <param name="rType"></param>
+ /// <returns></returns>
+ public bool DeleteModel(CY.Model.OA_Kaipiaonew rType)
+ {
+ try
+ {
+ _IOA_KaipiaonewDAL.DeleteModel(rType);
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ return true;
+ }
+
+ /// <summary>
+ /// 鏌ヨ鍚堜綔瀹㈡埛鍒嗛〉鍒楄〃
+ /// </summary>
+ /// <param name="pa"></param>
+ /// <returns></returns>
+ public IEnumerable<OA_Kaipiaonew> SelectModelPage(Pagination pa, Guid FirmId, string CreateTimeStart, string CreateTimeEnd,
+ string Kaipiaoshenqing, string Kehuqianshou, string BusinessManagerId, string CustormerName, string Chexiaozhuangtai,string shifouyuqi)
+ {
+ 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(CustormerName))
+ Condition += " and oe.CompanyName like '%" + CustormerName + "%'";
+ if (!string.IsNullOrEmpty(BusinessManagerId))
+ Condition += " and ok.BusinessManagerId = '" + BusinessManagerId + "'";
+ if (!string.IsNullOrEmpty(Kaipiaoshenqing))
+ Condition += " and ok.Kaipiaoshenqing = '" + Kaipiaoshenqing + "'";
+
+ if (!string.IsNullOrEmpty(Chexiaozhuangtai))
+ Condition += " and ok.Chexiaozhuangtai = '" + Chexiaozhuangtai + "'";
+
+ if (!string.IsNullOrEmpty(Kehuqianshou))
+ Condition += " and ok.Kehuqianshou = '" + Kehuqianshou + "'";
+
+
+ if (!string.IsNullOrEmpty(shifouyuqi))
+ {
+ if(shifouyuqi == "1")
+ {
+ Condition += " DATEDIFF(month,[CreateTime], '"+DateTime.Now.ToString("yyyy-MM-dd")+"')=0 ";
+ }
+ else if(shifouyuqi == "2")
+ {
+ Condition += " DATEDIFF(month,[CreateTime], '" + DateTime.Now.ToString("yyyy-MM-dd") + "')>0 ";
+ }
+ }
+
+
+
+ Query query = new Query();
+ IList<Criterion> criterias = new List<Criterion>()
+ {
+ new Criterion("", Condition),
+
+ new Criterion("orderBy"," CreateTime desc ")
+ };
+ query.Criteria = criterias;
+ return _IOA_KaipiaonewDAL.SelectModelPage(query, pa);
+ }
+
+ }
+}
diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_KaipiaonewcuishouBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_KaipiaonewcuishouBLL.cs
new file mode 100644
index 0000000..3e7406c
--- /dev/null
+++ b/CY_ECommercePlatform/CY.BLL/OA/OA_KaipiaonewcuishouBLL.cs
@@ -0,0 +1,140 @@
+锘�
+/**
+* OA_KaipiaonewcuishouBLL.cs
+*
+* 鍔� 鑳斤細 鍚堜綔瀹㈡埛涓氬姟閫昏緫绫�
+* 绫� 鍚嶏細 OA_KaipiaonewcuishouBLL
+*
+* 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_KaipiaonewcuishouBLL
+ {
+ IOA_KaipiaonewcuishouDAL _IOA_KaipiaonewcuishouDAL = null;
+
+ /// <summary>
+ /// 鍒濆鍖栨瀯閫�
+ /// </summary>
+ /// </summary>
+ public OA_KaipiaonewcuishouBLL()
+ {
+ //鑾峰彇OA_Kaipiaonewcuishou DAL瀹炵幇
+ _IOA_KaipiaonewcuishouDAL = Factory.GetDALByInterfaceName(DALInterface.IOA_KaipiaonewcuishouDAL) as IOA_KaipiaonewcuishouDAL;
+
+
+ }
+
+ /// <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_Kaipiaonewcuishou m_OA_Kaipiaonewcuishou)
+ {
+ try
+ {
+
+ return _IOA_KaipiaonewcuishouDAL.InserModel(m_OA_Kaipiaonewcuishou);
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
+ /// <summary>
+ /// 淇敼閫佽揣瀹夋帓
+ /// </summary>
+ /// <param name="rType"></param>
+ /// <returns></returns>
+ public bool UpdateModel(CY.Model.OA_Kaipiaonewcuishou m_OA_Kaipiaonewcuishou)
+ {
+ try
+ {
+ return _IOA_KaipiaonewcuishouDAL.UpdateModel(m_OA_Kaipiaonewcuishou);
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇鍏ㄩ儴鍚堜綔瀹㈡埛
+ /// </summary>
+ /// <param name="Keyid">涓婚敭id</param>
+ /// <returns></returns>
+ public IEnumerable<OA_Kaipiaonewcuishou> GetModelList()
+ {
+ Query query = new Query();
+ return _IOA_KaipiaonewcuishouDAL.SelectAllModel(query);
+ }
+
+
+ /// <summary>
+ /// 鏍规嵁formid鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ public IEnumerable<Model.OA_Kaipiaonewcuishou> GetModelByKaipiaoId(string KaipiaoId)
+ {
+
+ return _IOA_KaipiaonewcuishouDAL.GetModelByKaipiaoId(KaipiaoId);
+ }
+
+ /// <summary>
+ /// 鑾峰彇鍏ㄩ儴鍚堜綔瀹㈡埛
+ /// </summary>
+ /// <param name="Keyid">涓婚敭id</param>
+ /// <returns></returns>
+ public OA_Kaipiaonewcuishou GetModelByKeyid(int keyid)
+ {
+
+ return _IOA_KaipiaonewcuishouDAL.GetModelByKeyid(keyid);
+ }
+
+ /// <summary>
+ /// 鍒犻櫎鍚堜綔瀹㈡埛
+ /// </summary>
+ /// <param name="rType"></param>
+ /// <returns></returns>
+ public bool DeleteModel(CY.Model.OA_Kaipiaonewcuishou rType)
+ {
+ try
+ {
+ _IOA_KaipiaonewcuishouDAL.DeleteModel(rType);
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ return true;
+ }
+
+
+
+ }
+}
diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_KaipiaonewhuikuanBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_KaipiaonewhuikuanBLL.cs
new file mode 100644
index 0000000..69e04ea
--- /dev/null
+++ b/CY_ECommercePlatform/CY.BLL/OA/OA_KaipiaonewhuikuanBLL.cs
@@ -0,0 +1,138 @@
+锘�
+/**
+* OA_KaipiaonewhuikuanBLL.cs
+*
+* 鍔� 鑳斤細 鍚堜綔瀹㈡埛涓氬姟閫昏緫绫�
+* 绫� 鍚嶏細 OA_KaipiaonewhuikuanBLL
+*
+* 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_KaipiaonewhuikuanBLL
+ {
+ IOA_KaipiaonewhuikuanDAL _IOA_KaipiaonewhuikuanDAL = null;
+
+ /// <summary>
+ /// 鍒濆鍖栨瀯閫�
+ /// </summary>
+ /// </summary>
+ public OA_KaipiaonewhuikuanBLL()
+ {
+ //鑾峰彇OA_Kaipiaonewhuikuan DAL瀹炵幇
+ _IOA_KaipiaonewhuikuanDAL = Factory.GetDALByInterfaceName(DALInterface.IOA_KaipiaonewhuikuanDAL) as IOA_KaipiaonewhuikuanDAL;
+
+
+ }
+
+ /// <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_Kaipiaonewhuikuan m_OA_Kaipiaonewhuikuan)
+ {
+ try
+ {
+
+ return _IOA_KaipiaonewhuikuanDAL.InserModel(m_OA_Kaipiaonewhuikuan);
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
+ /// <summary>
+ /// 淇敼閫佽揣瀹夋帓
+ /// </summary>
+ /// <param name="rType"></param>
+ /// <returns></returns>
+ public bool UpdateModel(CY.Model.OA_Kaipiaonewhuikuan m_OA_Kaipiaonewhuikuan)
+ {
+ try
+ {
+ return _IOA_KaipiaonewhuikuanDAL.UpdateModel(m_OA_Kaipiaonewhuikuan);
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇鍏ㄩ儴鍚堜綔瀹㈡埛
+ /// </summary>
+ /// <param name="Keyid">涓婚敭id</param>
+ /// <returns></returns>
+ public IEnumerable<OA_Kaipiaonewhuikuan> GetModelList()
+ {
+ Query query = new Query();
+ return _IOA_KaipiaonewhuikuanDAL.SelectAllModel(query);
+ }
+
+
+ /// <summary>
+ /// 鏍规嵁formid鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ public IEnumerable<Model.OA_Kaipiaonewhuikuan> GetModelByKaipiaoId(string KaipiaoId)
+ {
+
+ return _IOA_KaipiaonewhuikuanDAL.GetModelByKaipiaoId(KaipiaoId);
+ }
+
+ /// <summary>
+ /// 鑾峰彇鍏ㄩ儴鍚堜綔瀹㈡埛
+ /// </summary>
+ /// <param name="Keyid">涓婚敭id</param>
+ /// <returns></returns>
+ public OA_Kaipiaonewhuikuan GetModelByKeyid(int keyid)
+ {
+
+ return _IOA_KaipiaonewhuikuanDAL.GetModelByKeyid(keyid);
+ }
+
+ /// <summary>
+ /// 鍒犻櫎鍚堜綔瀹㈡埛
+ /// </summary>
+ /// <param name="rType"></param>
+ /// <returns></returns>
+ public bool DeleteModel(CY.Model.OA_Kaipiaonewhuikuan rType)
+ {
+ try
+ {
+ _IOA_KaipiaonewhuikuanDAL.DeleteModel(rType);
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ return true;
+ }
+
+ }
+}
diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_KaipiaoshenqingBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_KaipiaoshenqingBLL.cs
index a98c77f..d048350 100644
--- a/CY_ECommercePlatform/CY.BLL/OA/OA_KaipiaoshenqingBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/OA/OA_KaipiaoshenqingBLL.cs
@@ -139,9 +139,9 @@
/// <param name="pa"></param>
/// <returns></returns>
public IEnumerable<OA_Kaipiaoshenqing> SelectModelPage(Pagination pa, Guid FirmId, string CreateTimeStart, string CreateTimeEnd,
- string Kaipiaoshenqing, string Kehuqianshou, string BusinessManagerId, string CustormerName)
+ string Kaipiaoshenqing, string Kehuqianshou, string BusinessManagerId, string CustormerName, string PayStates, string HuikuanStates)
{
- string Condition = " and ok.FirmId ='" + FirmId + "' ";
+ string Condition = " and ok.FirmId ='" + FirmId + "' and ok.ApprovalStatus = 1 ";
if (!string.IsNullOrEmpty(CreateTimeStart))
Condition += " and DATEDIFF(day,ok.[CreateTime],'" + CreateTimeStart + "')<=0 ";
@@ -158,12 +158,35 @@
if (!string.IsNullOrEmpty(CustormerName))
Condition += " and oe.CompanyName like '%" + CustormerName + "%'";
+ if (!string.IsNullOrEmpty(PayStates))
+ {
+ if (PayStates == "2")
+ {
+ Condition += " and not EXISTS ( select eoe.[KaipiaoshenqingId] from [EC_OrderExtend] eoe inner join [EC_OrderBasic] eob on eob.Keyid = eoe.Keyid where ok.Keyid = eoe.[KaipiaoshenqingId] and eob.PayState !=-1 ) ";
+ }
+ else if (PayStates == "1")
+ {
+ Condition += " and EXISTS ( select eoe.[KaipiaoshenqingId] from [EC_OrderExtend] eoe inner join [EC_OrderBasic] eob on eob.Keyid = eoe.Keyid where ok.Keyid = eoe.[KaipiaoshenqingId] and eob.PayState !=-1 ) ";
+ }
+ }
+ if (!string.IsNullOrEmpty(HuikuanStates))
+ {
+ if (HuikuanStates == "2")
+ {
+ Condition += " and ok.Huikuanmoney >0 ";
+ }
+ else if (HuikuanStates == "1")
+ {
+ Condition += " and ( ok.Huikuanmoney is null or ok.Huikuanmoney <=0) ";
+ }
+ }
+
Query query = new Query();
IList<Criterion> criterias = new List<Criterion>()
{
new Criterion("", Condition),
- new Criterion("orderBy"," SellerOrderId desc ")
+ new Criterion("orderBy"," CreateTime desc ")
};
query.Criteria = criterias;
return _IOA_KaipiaoshenqingDAL.SelectModelPage(query, pa);
diff --git a/CY_ECommercePlatform/CY.IDAL/CY.IDAL.csproj b/CY_ECommercePlatform/CY.IDAL/CY.IDAL.csproj
index 5acd832..0e8328e 100644
--- a/CY_ECommercePlatform/CY.IDAL/CY.IDAL.csproj
+++ b/CY_ECommercePlatform/CY.IDAL/CY.IDAL.csproj
@@ -161,6 +161,8 @@
<Compile Include="OA\IOA_CarrepairDAL.cs" />
<Compile Include="OA\IOA_CuikuanjiluDAL.cs" />
<Compile Include="OA\IOA_DeliverPlanDAL.cs" />
+ <Compile Include="OA\IOA_KaipiaonewcuishouDAL.cs" />
+ <Compile Include="OA\IOA_KaipiaonewDAL.cs" />
<Compile Include="OA\IOA_KipiaoshenqingDAL.cs" />
<Compile Include="OA\IOA_WageAwardPunishDAL.cs" />
<Compile Include="LF\ILF_OrderFilesDAL.cs" />
@@ -223,6 +225,7 @@
<Compile Include="OA\IOA_WorkReminderDAL.cs" />
<Compile Include="OA\IOA_WorkPlanDAL.cs" />
<Compile Include="OA\IOA_YujihuikuanDAL.cs" />
+ <Compile Include="OA\IOA_KaipiaonewhuikuanDAL.cs" />
<Compile Include="Pay\IPay_AccountedRecordDAL.cs" />
<Compile Include="Pay\IPay_CashApplyOperateRecordDAL.cs" />
<Compile Include="Pay\IPay_IncExpRecordDAL.cs" />
diff --git a/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderDAL.cs b/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderDAL.cs
index 8d8068b..0133053 100644
--- a/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderDAL.cs
+++ b/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderDAL.cs
@@ -171,6 +171,10 @@
bool OldUpdateKaipiaoshenqings(EC_OrderExtend model, string ids);
+ bool NewUpdateKaipiaoshenqings(EC_OrderExtend model);
+
+ bool JujueKaipiaoshenqings(EC_OrderExtend model);
+
bool OldUpdateKaipiaoqueren(EC_OrderExtend model);
bool OldUpdateQuchudingdan(EC_OrderExtend model);
diff --git a/CY_ECommercePlatform/CY.IDAL/OA/IOA_KaipiaonewDAL.cs b/CY_ECommercePlatform/CY.IDAL/OA/IOA_KaipiaonewDAL.cs
new file mode 100644
index 0000000..16fdb46
--- /dev/null
+++ b/CY_ECommercePlatform/CY.IDAL/OA/IOA_KaipiaonewDAL.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_KaipiaonewDAL : ICommonDAL, IPaging<OA_Kaipiaonew>, IGetAllModel<OA_Kaipiaonew>
+ {
+ /// <summary>
+ /// 鏍规嵁缂栧彿鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ OA_Kaipiaonew GetModelByKeyid(int keyid);
+
+ /// <summary>
+ /// 鏍规嵁formid鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ IEnumerable<OA_Kaipiaonew> GetModelBySellerOrderId(int SellerOrderId);
+ }
+}
diff --git a/CY_ECommercePlatform/CY.IDAL/OA/IOA_KaipiaonewcuishouDAL.cs b/CY_ECommercePlatform/CY.IDAL/OA/IOA_KaipiaonewcuishouDAL.cs
new file mode 100644
index 0000000..feb49dd
--- /dev/null
+++ b/CY_ECommercePlatform/CY.IDAL/OA/IOA_KaipiaonewcuishouDAL.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_KaipiaonewcuishouDAL : ICommonDAL, IPaging<OA_Kaipiaonewcuishou>, IGetAllModel<OA_Kaipiaonewcuishou>
+ {
+ /// <summary>
+ /// 鏍规嵁缂栧彿鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ OA_Kaipiaonewcuishou GetModelByKeyid(int keyid);
+
+ /// <summary>
+ /// 鏍规嵁KaipiaoId鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="KaipiaoId">缂栧彿</param>
+ /// <returns></returns>
+ IEnumerable<OA_Kaipiaonewcuishou> GetModelByKaipiaoId(string KaipiaoId);
+ }
+}
diff --git a/CY_ECommercePlatform/CY.IDAL/OA/IOA_KaipiaonewhuikuanDAL.cs b/CY_ECommercePlatform/CY.IDAL/OA/IOA_KaipiaonewhuikuanDAL.cs
new file mode 100644
index 0000000..765f1d5
--- /dev/null
+++ b/CY_ECommercePlatform/CY.IDAL/OA/IOA_KaipiaonewhuikuanDAL.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_KaipiaonewhuikuanDAL : ICommonDAL, IPaging<OA_Kaipiaonewhuikuan>, IGetAllModel<OA_Kaipiaonewhuikuan>
+ {
+ /// <summary>
+ /// 鏍规嵁缂栧彿鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ OA_Kaipiaonewhuikuan GetModelByKeyid(int keyid);
+
+ /// <summary>
+ /// 鏍规嵁KaipiaoId鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="KaipiaoId">缂栧彿</param>
+ /// <returns></returns>
+ IEnumerable<OA_Kaipiaonewhuikuan> GetModelByKaipiaoId(string KaipiaoId);
+ }
+}
diff --git a/CY_ECommercePlatform/CY.Model/CY.Model.csproj b/CY_ECommercePlatform/CY.Model/CY.Model.csproj
index 50e216b..e6b8825 100644
--- a/CY_ECommercePlatform/CY.Model/CY.Model.csproj
+++ b/CY_ECommercePlatform/CY.Model/CY.Model.csproj
@@ -234,6 +234,9 @@
<Compile Include="OA\OA_IntentionCustomer.cs" />
<Compile Include="OA\OA_IntentionCustomerExtend.cs" />
<Compile Include="OA\OA_Inventory.cs" />
+ <Compile Include="OA\OA_Kaipiaonew.cs" />
+ <Compile Include="OA\OA_Kaipiaonewcuishou.cs" />
+ <Compile Include="OA\OA_Kaipiaonewhuikuan.cs" />
<Compile Include="OA\OA_Kaipiaoshenqing.cs" />
<Compile Include="OA\OA_OrderWorkListRelation.cs" />
<Compile Include="OA\OA_OutOfStorage.cs" />
diff --git a/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs b/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs
index dfe6cfe..31d4066 100644
--- a/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs
+++ b/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs
@@ -314,6 +314,11 @@
/// </summary>
public string BusinessManager { get; set; }
+ /// <summary>
+ /// 涓氬姟缁忕悊
+ /// </summary>
+ public int? BusinessManagerId { get; set; }
+
public DateTime? DelayTime { get; set; }
@@ -942,6 +947,13 @@
this.SuodanOperator = isChange ? MyConvert.ConvertToString(value) : this.SuodanOperator;
theValue = this.SuodanOperator;
}
+ else if ("BusinessManagerId".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 99)
+ {
+ this.BusinessManagerId = isChange ? MyConvert.ConvertToInt32(value) : this.BusinessManagerId;
+ theValue = this.BusinessManagerId;
+ }
+
+
#endregion
return theValue;
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_Kaipiaonew.cs b/CY_ECommercePlatform/CY.Model/OA/OA_Kaipiaonew.cs
new file mode 100644
index 0000000..299e45d
--- /dev/null
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_Kaipiaonew.cs
@@ -0,0 +1,486 @@
+锘�/**
+*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_Kaipiaonew : IAggregateRoot
+ {
+ #region Model
+ /// <summary>
+ /// Keyid
+ /// </summary>
+ public int Keyid { get; set; }
+ /// <summary>
+ /// FirmId
+ /// </summary>
+ public Guid FirmId { get; set; }
+ /// <summary>
+ /// 瀹㈡埛id
+ /// </summary>
+ public Guid BuyerId { get; set; }
+ /// <summary>
+ /// 瀹㈡埛id
+ /// </summary>
+ public string BuyerName { get; set; }
+
+ public int? BusinessManagerId { get; set; }
+
+ public string BusinessManager { get; set; }
+
+ /// <summary>
+ /// 璇存槑
+ /// </summary>
+ public string remark { get; set; }
+ /// <summary>
+ /// 鍒涘缓浜�
+ /// </summary>
+ public string Creater
+ {
+ get;
+ set;
+ }
+
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ public DateTime? CreateTime
+ {
+ get;
+ set;
+ }
+
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ public string CreateTimeName
+ {
+ get {
+ if (CreateTime.HasValue)
+ {
+ return CreateTime.Value.ToString("yyyy-MM-dd");
+ }
+ else
+ {
+ return "";
+ }
+
+ }
+
+ }
+ /// <summary>
+ /// 淇敼浜�
+ /// </summary>
+ public string Updater
+ {
+ get;
+ set;
+ }
+ /// <summary>
+ /// 淇敼鏃堕棿
+ /// </summary>
+ public DateTime? LastUpdateTime
+ {
+ get;
+ set;
+ }
+
+ public string SellerOrderId
+ {
+ get;
+ set;
+ }
+
+ /// <summary>
+ /// 鏁伴噺
+ /// </summary>
+ public int shuliang
+ {
+ get
+ {
+ if (!string.IsNullOrEmpty(SellerOrderId))
+ {
+ return SellerOrderId.Trim(',').Split(',').Length;
+ }
+ else
+ {
+ return 0;
+ }
+
+ }
+
+ }
+
+
+ /// <summary>
+ /// 閫炬湡澶╂暟
+ /// </summary>
+ public int yuqi
+ {
+ get
+ {
+ if (CreateTime.HasValue)
+ {
+ var sss = DateTime.Now;
+ if (sss.Year == CreateTime.Value.Year && sss.Month == CreateTime.Value.Month)
+ {
+ return 0;
+ }
+ else
+ {
+ var dateTime = CreateTime.Value.AddMonths(1);
+ DateTime date1 = new DateTime(dateTime.Year, dateTime.Month, 1);
+
+ TimeSpan diff = sss.Subtract(date1);
+ return diff.Days;
+ }
+
+ }
+ else
+ {
+ return 0;
+ }
+
+ }
+
+ }
+
+
+ public string Fapiaohaoma { get; set; }
+ public string Kaipiaoshuoming { get; set; }
+
+ public decimal? Jine { get; set; }
+
+
+ public int? Kaipiaoshenqing
+ {
+ get;
+ set;
+ }
+
+ public string KaipiaoshenqingName { get; set; }
+
+
+ public string Nashuirenshibiehao { get; set; }
+
+ public string dizhidianhua { get; set; }
+
+ public string Kaihuhang { get; set; }
+
+ public decimal? Shoukuanjine { get; set; }
+ public DateTime? ShoukuanTime
+ {
+ get;
+ set;
+ }
+
+ public string ShoukuanCreater
+ {
+ get;
+ set;
+ }
+
+
+
+ public int? Chexiaozhuangtai { get; set; }
+ public DateTime? ChexiaoTime
+ {
+ get;
+ set;
+ }
+
+ public string ChexiaoCreater
+ {
+ get;
+ set;
+ }
+
+
+
+
+ public int? Kehuqianshou
+ {
+ get;
+ set;
+ }
+ public string KehuqianshouName { get; set; }
+
+ public string Qianshoutupian { get; set; }
+ public DateTime? KehuqianshouTime { get; set; }
+
+ public string KehuqianshouCreater
+ {
+ get;
+ set;
+ }
+
+ public DateTime? KaipiaoquerenTime { get; set; }
+
+ public string KaipiaoquerenCreater
+ {
+ get;
+ set;
+ }
+
+
+
+ public DateTime? CuishouTime { get; set; }
+
+
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ public string CuishouTimeName
+ {
+ get
+ {
+ if (CuishouTime.HasValue)
+ {
+ return CuishouTime.Value.ToString("MM-dd HH:mm");
+ }
+ else
+ {
+ return "";
+ }
+
+ }
+
+ }
+
+ public string CuishouCreater
+ {
+ 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 ("BuyerId".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 3)
+ {
+ this.BuyerId = isChange ? MyConvert.ConvertToGuid(value) : BuyerId;
+ theValue = this.BuyerId;
+ }
+ else if ("BuyerName".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 4)
+ {
+ this.BuyerName = isChange ? MyConvert.ConvertToString(value) : BuyerName;
+ theValue = this.BuyerName;
+ }
+
+ else if ("BusinessManagerId".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 5)
+ {
+ this.BusinessManagerId = isChange ? MyConvert.ConvertToInt32(value) : BusinessManagerId;
+ theValue = this.BusinessManagerId;
+ }
+ else if ("BusinessManager".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 6)
+ {
+ this.BusinessManager = isChange ? MyConvert.ConvertToString(value) : BusinessManager;
+ theValue = this.BusinessManager;
+ }
+ else if ("Kaipiaoshenqing".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 7)
+ {
+ this.Kaipiaoshenqing = isChange ? MyConvert.ConvertToInt32(value) : Kaipiaoshenqing;
+ theValue = this.Kaipiaoshenqing;
+ }
+ else if ("KaipiaoshenqingName".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 8)
+ {
+ this.KaipiaoshenqingName = isChange ? MyConvert.ConvertToString(value) : KaipiaoshenqingName;
+ theValue = this.KaipiaoshenqingName;
+ }
+ else if ("Kehuqianshou".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 9)
+ {
+ this.Kehuqianshou = isChange ? MyConvert.ConvertToInt32(value) : Kehuqianshou;
+ theValue = this.Kehuqianshou;
+ }
+ else if ("KehuqianshouName".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 10)
+ {
+ this.KehuqianshouName = isChange ? MyConvert.ConvertToString(value) : KehuqianshouName;
+ theValue = this.KehuqianshouName;
+ }
+ else if ("KehuqianshouTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 11)
+ {
+ this.KehuqianshouTime = isChange ? MyConvert.ConvertToDateTime(value) : KehuqianshouTime;
+ theValue = this.KehuqianshouTime;
+ }
+ else if ("KehuqianshouCreater".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 12)
+ {
+ this.KehuqianshouCreater = isChange ? MyConvert.ConvertToString(value) : KehuqianshouCreater;
+ theValue = this.KehuqianshouCreater;
+ }
+ else if ("KaipiaoquerenTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 13)
+ {
+ this.KaipiaoquerenTime = isChange ? MyConvert.ConvertToDateTime(value) : KaipiaoquerenTime;
+ theValue = this.KaipiaoquerenTime;
+ }
+ else if ("KaipiaoquerenCreater".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 13)
+ {
+ this.KaipiaoquerenCreater = isChange ? MyConvert.ConvertToString(value) : KaipiaoquerenCreater;
+ theValue = this.KaipiaoquerenCreater;
+ }
+
+
+
+
+
+
+ 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 ("SellerOrderId".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 20)
+ {
+ this.SellerOrderId = isChange ? MyConvert.ConvertToString(value) : SellerOrderId;
+ theValue = this.SellerOrderId;
+ }
+ else if ("remark".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 21)
+ {
+ this.remark = isChange ? MyConvert.ConvertToString(value) : remark;
+ theValue = this.remark;
+ }
+ else if ("Fapiaohaoma".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 22)
+ {
+ this.Fapiaohaoma = isChange ? MyConvert.ConvertToString(value) : Fapiaohaoma;
+ theValue = this.Fapiaohaoma;
+ }
+ else if ("Jine".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 23)
+ {
+ this.Jine = isChange ? MyConvert.ConvertToDecimal(value) : Jine;
+ theValue = this.Jine;
+ }
+ else if ("Nashuirenshibiehao".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 24)
+ {
+ this.Nashuirenshibiehao = isChange ? MyConvert.ConvertToString(value) : Nashuirenshibiehao;
+ theValue = this.Nashuirenshibiehao;
+ }
+ else if ("dizhidianhua".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 25)
+ {
+ this.dizhidianhua = isChange ? MyConvert.ConvertToString(value) : dizhidianhua;
+ theValue = this.dizhidianhua;
+ }
+ else if ("Kaihuhang".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 26)
+ {
+ this.Kaihuhang = isChange ? MyConvert.ConvertToString(value) : Kaihuhang;
+ theValue = this.Kaihuhang;
+ }
+ else if ("Shoukuanjine".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 27)
+ {
+ this.Shoukuanjine = isChange ? MyConvert.ConvertToDecimal(value) : Shoukuanjine;
+ theValue = this.Shoukuanjine;
+ }
+ else if ("ShoukuanTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 28)
+ {
+ this.ShoukuanTime = isChange ? MyConvert.ConvertToDateTime(value) : ShoukuanTime;
+ theValue = this.ShoukuanTime;
+ }
+ else if ("ShoukuanCreater".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 29)
+ {
+ this.ShoukuanCreater = isChange ? MyConvert.ConvertToString(value) : ShoukuanCreater;
+ theValue = this.ShoukuanCreater;
+ }
+ else if ("Chexiaozhuangtai".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 30)
+ {
+ this.Chexiaozhuangtai = isChange ? MyConvert.ConvertToInt32(value) : Chexiaozhuangtai;
+ theValue = this.Chexiaozhuangtai;
+ }
+ else if ("ChexiaoTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 31)
+ {
+ this.ChexiaoTime = isChange ? MyConvert.ConvertToDateTime(value) : ChexiaoTime;
+ theValue = this.ChexiaoTime;
+ }
+ else if ("ChexiaoCreater".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 32)
+ {
+ this.ChexiaoCreater = isChange ? MyConvert.ConvertToString(value) : ChexiaoCreater;
+ theValue = this.ChexiaoCreater;
+ }
+ else if ("Qianshoutupian".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 33)
+ {
+ this.Qianshoutupian = isChange ? MyConvert.ConvertToString(value) : Qianshoutupian;
+ theValue = this.Qianshoutupian;
+ }
+ else if ("Kaipiaoshuoming".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 34)
+ {
+ this.Kaipiaoshuoming = isChange ? MyConvert.ConvertToString(value) : Kaipiaoshuoming;
+ theValue = this.Kaipiaoshuoming;
+ }
+ else if ("CuishouTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 35)
+ {
+ this.CuishouTime = isChange ? MyConvert.ConvertToDateTime(value) : CuishouTime;
+ theValue = this.CuishouTime;
+ }
+ else if ("CuishouCreater".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 35)
+ {
+ this.CuishouCreater = isChange ? MyConvert.ConvertToString(value) : CuishouCreater;
+ theValue = this.CuishouCreater;
+ }
+
+
+ return theValue;
+ }
+
+ #endregion
+ }
+}
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_Kaipiaonewcuishou.cs b/CY_ECommercePlatform/CY.Model/OA/OA_Kaipiaonewcuishou.cs
new file mode 100644
index 0000000..a50f322
--- /dev/null
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_Kaipiaonewcuishou.cs
@@ -0,0 +1,121 @@
+锘�/**
+*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_Kaipiaonewcuishou : IAggregateRoot
+ {
+ #region Model
+ /// <summary>
+ /// Keyid
+ /// </summary>
+ public int Keyid { get; set; }
+ /// <summary>
+ /// KaipiaoId
+ /// </summary>
+ public Guid KaipiaoId { get; set; }
+
+
+
+ /// <summary>
+ /// 鍒涘缓浜�
+ /// </summary>
+ public string Creater
+ {
+ 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 ("FirmId".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 2)
+ {
+ this.KaipiaoId = isChange ? MyConvert.ConvertToGuid(value) : KaipiaoId;
+ theValue = this.KaipiaoId;
+ }
+
+
+
+
+ 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;
+ }
+
+ return theValue;
+ }
+
+ #endregion
+ }
+}
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_Kaipiaonewhuikuan.cs b/CY_ECommercePlatform/CY.Model/OA/OA_Kaipiaonewhuikuan.cs
new file mode 100644
index 0000000..8cfb0f3
--- /dev/null
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_Kaipiaonewhuikuan.cs
@@ -0,0 +1,136 @@
+锘�/**
+*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_Kaipiaonewhuikuan : IAggregateRoot
+ {
+ #region Model
+ /// <summary>
+ /// Keyid
+ /// </summary>
+ public int Keyid { get; set; }
+ /// <summary>
+ /// KaipiaoId
+ /// </summary>
+ public Guid KaipiaoId { get; set; }
+
+
+
+ /// <summary>
+ /// 鍒涘缓浜�
+ /// </summary>
+ public string Creater
+ {
+ get;
+ set;
+ }
+
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ public DateTime? CreateTime
+ {
+ get;
+ set;
+ }
+
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ public DateTime? huikuanTime
+ {
+ get;
+ set;
+ }
+
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ public decimal? Huikuanmoney
+ {
+ 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.KaipiaoId = isChange ? MyConvert.ConvertToGuid(value) : KaipiaoId;
+ theValue = this.KaipiaoId;
+ }
+
+
+
+
+ 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 ("huikuanTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 5)
+ {
+ this.huikuanTime = isChange ? MyConvert.ConvertToDateTime(value) : huikuanTime;
+ theValue = this.huikuanTime;
+ }
+ else if ("Huikuanmoney".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 6)
+ {
+ this.Huikuanmoney = isChange ? MyConvert.ConvertToDecimal(value) : Huikuanmoney;
+ theValue = this.Huikuanmoney;
+ }
+
+
+ return theValue;
+ }
+
+ #endregion
+ }
+}
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_Kaipiaoshenqing.cs b/CY_ECommercePlatform/CY.Model/OA/OA_Kaipiaoshenqing.cs
index 9996ec1..818ba13 100644
--- a/CY_ECommercePlatform/CY.Model/OA/OA_Kaipiaoshenqing.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_Kaipiaoshenqing.cs
@@ -51,6 +51,16 @@
public int? BusinessManagerId { get; set; }
+ /// <summary>
+ /// 瀹℃牳鐘舵��/鏈鏍�0,鎵瑰噯1,涓嶆壒鍑�2,宸茬粨鏉�3
+ /// </summary>
+ public int? ApprovalStatus { get; set; }
+
+ public decimal? Zengjianmoney { get; set; }
+
+ public decimal? kpmoney { get; set; }
+
+
public string BusinessManager { get; set; }
/// <summary>
@@ -136,6 +146,32 @@
}
public string SellerOrderId
+ {
+ get;
+ set;
+ }
+ public string Kehuqianshoutupian
+ {
+ get;
+ set;
+ }
+ public int? Dingdanshu
+ {
+ get;
+ set;
+ }
+ public string Fapiaohao
+ {
+ get;
+ set;
+ }
+ public decimal? Huikuanmoney
+ {
+ get;
+ set;
+ }
+ //鍌鏃堕棿
+ public DateTime? ShoukuanTime
{
get;
set;
@@ -275,6 +311,47 @@
this.remark = isChange ? MyConvert.ConvertToString(value) : remark;
theValue = this.remark;
}
+ else if ("ApprovalStatus".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 22)
+ {
+ this.ApprovalStatus = isChange ? MyConvert.ConvertToInt32(value) : ApprovalStatus;
+ theValue = this.ApprovalStatus;
+ }
+ else if ("Zengjianmoney".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 23)
+ {
+ this.Zengjianmoney = isChange ? MyConvert.ConvertToDecimal(value) : Zengjianmoney;
+ theValue = this.Zengjianmoney;
+ }
+ else if ("Kehuqianshoutupian".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 24)
+ {
+ this.Kehuqianshoutupian = isChange ? MyConvert.ConvertToString(value) : Kehuqianshoutupian;
+ theValue = this.Kehuqianshoutupian;
+ }
+ else if ("Dingdanshu".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 25)
+ {
+ this.Dingdanshu = isChange ? MyConvert.ConvertToInt32(value) : Dingdanshu;
+ theValue = this.Dingdanshu;
+ }
+ else if ("Fapiaohao".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 26)
+ {
+ this.Fapiaohao = isChange ? MyConvert.ConvertToString(value) : Fapiaohao;
+ theValue = this.Fapiaohao;
+ }
+ else if ("Huikuanmoney".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 27)
+ {
+ this.Huikuanmoney = isChange ? MyConvert.ConvertToDecimal(value) : Huikuanmoney;
+ theValue = this.Huikuanmoney;
+ }
+ else if ("ShoukuanTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 28)
+ {
+ this.ShoukuanTime = isChange ? MyConvert.ConvertToDateTime(value) : ShoukuanTime;
+ theValue = this.ShoukuanTime;
+ }
+ else if ("kpmoney".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 28)
+ {
+ this.kpmoney = isChange ? MyConvert.ConvertToDecimal(value) : kpmoney;
+ theValue = this.kpmoney;
+ }
+
return theValue;
}
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_WorkPlan.cs b/CY_ECommercePlatform/CY.Model/OA/OA_WorkPlan.cs
index d6d7cb0..beb9301 100644
--- a/CY_ECommercePlatform/CY.Model/OA/OA_WorkPlan.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_WorkPlan.cs
@@ -130,7 +130,7 @@
}
/// <summary>
/// <para>璁″垝鎬ц川/瀹㈡埛鎷滆1,涓氬姟璺熷崟2,琛屾斂宸ヤ綔3,鍏朵粬璁″垝4</para>
- /// <para>璇风ず绫诲埆/璇峰亣5,鍑哄樊6,鐢ㄨ溅7,閲囪喘鐢宠8,鐗╁搧棰嗙敤9,涓氬姟缁忚垂10,瀹㈡埛鑱旇皧11,鍏朵粬12</para>
+ /// <para>璇风ず绫诲埆/璇峰亣5,鍑哄樊6,鐢ㄨ溅7,閲囪喘鐢宠8,鐗╁搧棰嗙敤9,涓氬姟缁忚垂10,瀹㈡埛鑱旇皧11,鍏朵粬12,寮�绁ㄧ敵璇�13</para>
/// </summary>
public int? PlanDataType
{
diff --git a/CY_ECommercePlatform/CY.SQLDAL/CY.SQLDAL.csproj b/CY_ECommercePlatform/CY.SQLDAL/CY.SQLDAL.csproj
index 767605b..15fd216 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/CY.SQLDAL.csproj
+++ b/CY_ECommercePlatform/CY.SQLDAL/CY.SQLDAL.csproj
@@ -185,6 +185,9 @@
<Compile Include="OA\OA_DepartmentDAL.cs" />
<Compile Include="OA\OA_DocumentDAL.cs" />
<Compile Include="OA\OA_DocumentDicDAL.cs" />
+ <Compile Include="OA\OA_KaipiaonewcuishouDAL.cs" />
+ <Compile Include="OA\OA_KaipiaonewDAL.cs" />
+ <Compile Include="OA\OA_KaipiaonewhuikuanDAL.cs" />
<Compile Include="OA\OA_KipiaoshenqingDAL.cs" />
<Compile Include="OA\OA_PropertyCateDAL.cs" />
<Compile Include="OA\OA_PropertyManageDAL.cs" />
diff --git a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderDAL.cs
index 62147cb..d94b0db 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderDAL.cs
@@ -880,6 +880,82 @@
return true;
}
+ /// <summary>
+ /// 淇敼
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public bool NewUpdateKaipiaoshenqings(EC_OrderExtend model)
+ {
+
+ Model.EC_OrderExtend trueModel = model;
+ if (trueModel == null)
+ {
+ return false;
+ }
+ SqlParameter KaipiaoshenqingTime = null;
+ if (trueModel.KaipiaoshenqingTime.HasValue)
+ {
+ KaipiaoshenqingTime = new SqlParameter("@KaipiaoshenqingTime", trueModel.KaipiaoshenqingTime);
+ }
+ else
+ {
+ KaipiaoshenqingTime = new SqlParameter("@KaipiaoshenqingTime", DBNull.Value);
+ }
+ IList<SqlParameter> sqlParms = new List<SqlParameter>()
+ {
+ //new SqlParameter("@Keyid",trueModel.Keyid),
+ KaipiaoshenqingTime,
+ new SqlParameter("@Kaipiaoshenqing",trueModel.Kaipiaoshenqing),
+ new SqlParameter("@KaipiaoshenqingCreater",trueModel.KaipiaoshenqingCreater),
+ new SqlParameter("@KaipiaoshenqingId",trueModel.KaipiaoshenqingId),
+ };
+ string sql = " Update EC_OrderExtend Set KaipiaoshenqingTime=@KaipiaoshenqingTime ,Kaipiaoshenqing=@Kaipiaoshenqing ,KaipiaoshenqingCreater=@KaipiaoshenqingCreater Where KaipiaoshenqingId=@KaipiaoshenqingId ";//@keyid
+ try
+ {
+ _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ return true;
+ }
+
+
+
+ /// <summary>
+ /// 淇敼
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public bool JujueKaipiaoshenqings(EC_OrderExtend model)
+ {
+
+ Model.EC_OrderExtend trueModel = model;
+ if (trueModel == null)
+ {
+ return false;
+ }
+
+ IList<SqlParameter> sqlParms = new List<SqlParameter>()
+ {
+
+ new SqlParameter("@KaipiaoshenqingId",trueModel.KaipiaoshenqingId),
+ };
+ string sql = " Update EC_OrderExtend Set KaipiaoshenqingTime=null ,Kaipiaoshenqing=2 ,KaipiaoshenqingCreater=null ,KaipiaoshenqingId=null Where KaipiaoshenqingId =@KaipiaoshenqingId ";//@keyid
+ try
+ {
+ _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ return true;
+ }
+
+
/// <summary>
/// 淇敼
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_KaipiaonewDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_KaipiaonewDAL.cs
new file mode 100644
index 0000000..5c8fd9e
--- /dev/null
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_KaipiaonewDAL.cs
@@ -0,0 +1,370 @@
+锘�
+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;
+using System;
+
+namespace CY.SQLDAL
+{
+ public class OA_KaipiaonewDAL: IOA_KaipiaonewDAL
+ {
+ 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, os.Name as BusinessManager " +
+ " from [OA_Kaipiaonew] ok inner join [OA_CorporateClients] oe on oe.Keyid = ok.[BuyerId] " +
+
+
+ " 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 = " CreateTime desc ";
+ #endregion
+
+ public OA_KaipiaonewDAL()
+ {
+ _dataBase = new Database();
+ }
+
+ /// <summary>
+ /// 鏂板
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public bool InserModel(Infrastructure.Domain.IAggregateRoot model)
+ {
+ Model.OA_Kaipiaonew trueModel = model as Model.OA_Kaipiaonew;
+ if (trueModel == null)
+ {
+ return false;
+ }
+ SqlParameter KehuqianshouTime = null;
+ if (trueModel.KehuqianshouTime.HasValue)
+ {
+ KehuqianshouTime = new SqlParameter("@KehuqianshouTime", trueModel.KehuqianshouTime.Value);
+ }
+ else
+ {
+ KehuqianshouTime = new SqlParameter("@KehuqianshouTime", DBNull.Value);
+ }
+
+ SqlParameter KaipiaoquerenTime = null;
+ if (trueModel.KaipiaoquerenTime.HasValue)
+ {
+ KaipiaoquerenTime = new SqlParameter("@KaipiaoquerenTime", trueModel.KaipiaoquerenTime.Value);
+ }
+ else
+ {
+ KaipiaoquerenTime = new SqlParameter("@KaipiaoquerenTime", DBNull.Value);
+ }
+
+ SqlParameter ShoukuanTime = null;
+ if (trueModel.ShoukuanTime.HasValue)
+ {
+ ShoukuanTime = new SqlParameter("@ShoukuanTime", trueModel.ShoukuanTime.Value);
+ }
+ else
+ {
+ ShoukuanTime = new SqlParameter("@ShoukuanTime", DBNull.Value);
+ }
+ SqlParameter ChexiaoTime = null;
+ if (trueModel.ChexiaoTime.HasValue)
+ {
+ ChexiaoTime = new SqlParameter("@ChexiaoTime", trueModel.ChexiaoTime.Value);
+ }
+ else
+ {
+ ChexiaoTime = new SqlParameter("@ChexiaoTime", DBNull.Value);
+ }
+
+ SqlParameter CuishouTime = null;
+ if (trueModel.CuishouTime.HasValue)
+ {
+ CuishouTime = new SqlParameter("@CuishouTime", trueModel.CuishouTime.Value);
+ }
+ else
+ {
+ CuishouTime = new SqlParameter("@CuishouTime", DBNull.Value);
+ }
+
+
+ IList<SqlParameter> sqlParms = new List<SqlParameter>()
+ {
+
+ new SqlParameter("@Keyid",trueModel.Keyid),
+ new SqlParameter("@FirmId",trueModel.FirmId),
+ new SqlParameter("@BuyerId",trueModel.BuyerId),
+ new SqlParameter("@Kaipiaoshenqing",trueModel.Kaipiaoshenqing),
+ new SqlParameter("@Kehuqianshou",trueModel.Kehuqianshou),
+ new SqlParameter("@Qianshoutupian",trueModel.Qianshoutupian),
+ KehuqianshouTime,
+ new SqlParameter("@KehuqianshouCreater",trueModel.KehuqianshouCreater),
+ KaipiaoquerenTime,
+ new SqlParameter("@KaipiaoquerenCreater",trueModel.KaipiaoquerenCreater),
+ new SqlParameter("@BusinessManagerId",trueModel.BusinessManagerId),
+ new SqlParameter("@Creater",trueModel.Creater),
+ new SqlParameter("@CreateTime",trueModel.CreateTime),
+ new SqlParameter("@Updater",trueModel.Updater),
+ new SqlParameter("@LastUpdateTime",trueModel.LastUpdateTime),
+ new SqlParameter("@SellerOrderId",trueModel.SellerOrderId),
+ new SqlParameter("@remark",trueModel.remark),
+ new SqlParameter("@Fapiaohaoma",trueModel.Fapiaohaoma),
+ new SqlParameter("@Jine",trueModel.Jine.HasValue?trueModel.Jine.Value:0),
+ new SqlParameter("@Kaipiaoshuoming",trueModel.Kaipiaoshuoming),
+ new SqlParameter("@dizhidianhua",trueModel.dizhidianhua),
+ new SqlParameter("@Kaihuhang",trueModel.Kaihuhang),
+ new SqlParameter("@Shoukuanjine",trueModel.Shoukuanjine.HasValue?trueModel.Shoukuanjine.Value:0),
+ ShoukuanTime,
+ new SqlParameter("@ShoukuanCreater",trueModel.ShoukuanCreater),
+ new SqlParameter("@Chexiaozhuangtai",trueModel.Chexiaozhuangtai.HasValue?trueModel.Chexiaozhuangtai.Value:0),
+ ChexiaoTime,
+ new SqlParameter("@ChexiaoCreater",trueModel.ChexiaoCreater),
+ CuishouTime,
+ new SqlParameter("@CuishouCreater",trueModel.CuishouCreater),
+ };
+ string sql = "Insert Into OA_Kaipiaonew ([Keyid],[FirmId],[BuyerId],[Kaipiaoshenqing],[Kehuqianshou],[Qianshoutupian], [KehuqianshouTime], [KehuqianshouCreater],[KaipiaoquerenTime], [KaipiaoquerenCreater],[BusinessManagerId], [Creater],[CreateTime],[Updater],[LastUpdateTime],[SellerOrderId],remark,Fapiaohaoma,Jine,Kaipiaoshuoming,dizhidianhua,Kaihuhang,Shoukuanjine,ShoukuanTime,ShoukuanCreater,Chexiaozhuangtai,ChexiaoTime,ChexiaoCreater,CuishouTime,CuishouCreater)"
+ + " Values ( @Keyid,@FirmId,@BuyerId,@Kaipiaoshenqing, @Kehuqianshou,@Qianshoutupian, @KehuqianshouTime, @KehuqianshouCreater, @KaipiaoquerenTime, @KaipiaoquerenCreater, @BusinessManagerId, @Creater,@CreateTime,@Updater,@LastUpdateTime,@SellerOrderId,@remark,@Fapiaohaoma,@Jine.@Kaipiaoshuoming,@dizhidianhua,@Kaihuhang,@Shoukuanjine,@ShoukuanTime,@ShoukuanCreater,@Chexiaozhuangtai,@ChexiaoTime,@ChexiaoCreater,@CuishouTime,@CuishouCreater )";
+ 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_Kaipiaonew trueModel = model as Model.OA_Kaipiaonew;
+ if (trueModel == null)
+ {
+ return false;
+ }
+ SqlParameter KehuqianshouTime = null;
+ if (trueModel.KehuqianshouTime.HasValue)
+ {
+ KehuqianshouTime = new SqlParameter("@KehuqianshouTime", trueModel.KehuqianshouTime.Value);
+ }
+ else
+ {
+ KehuqianshouTime = new SqlParameter("@KehuqianshouTime", DBNull.Value);
+ }
+
+ SqlParameter KaipiaoquerenTime = null;
+ if (trueModel.KaipiaoquerenTime.HasValue)
+ {
+ KaipiaoquerenTime = new SqlParameter("@KaipiaoquerenTime", trueModel.KaipiaoquerenTime.Value);
+ }
+ else
+ {
+ KaipiaoquerenTime = new SqlParameter("@KaipiaoquerenTime", DBNull.Value);
+ }
+
+ SqlParameter ShoukuanTime = null;
+ if (trueModel.ShoukuanTime.HasValue)
+ {
+ ShoukuanTime = new SqlParameter("@ShoukuanTime", trueModel.ShoukuanTime.Value);
+ }
+ else
+ {
+ ShoukuanTime = new SqlParameter("@ShoukuanTime", DBNull.Value);
+ }
+ SqlParameter ChexiaoTime = null;
+ if (trueModel.ChexiaoTime.HasValue)
+ {
+ ChexiaoTime = new SqlParameter("@ChexiaoTime", trueModel.ChexiaoTime.Value);
+ }
+ else
+ {
+ ChexiaoTime = new SqlParameter("@ChexiaoTime", DBNull.Value);
+ }
+ SqlParameter CuishouTime = null;
+ if (trueModel.CuishouTime.HasValue)
+ {
+ CuishouTime = new SqlParameter("@CuishouTime", trueModel.CuishouTime.Value);
+ }
+ else
+ {
+ CuishouTime = new SqlParameter("@CuishouTime", DBNull.Value);
+ }
+ IList<SqlParameter> sqlParms = new List<SqlParameter>()
+ {
+
+ new SqlParameter("@Keyid",trueModel.Keyid),
+ new SqlParameter("@FirmId",trueModel.FirmId),
+ new SqlParameter("@BuyerId",trueModel.BuyerId),
+ new SqlParameter("@Kaipiaoshenqing",trueModel.Kaipiaoshenqing),
+ new SqlParameter("@Kehuqianshou",trueModel.Kehuqianshou),
+ new SqlParameter("@Qianshoutupian",trueModel.Qianshoutupian),
+ KehuqianshouTime,
+ new SqlParameter("@KehuqianshouCreater",trueModel.KehuqianshouCreater),
+ KaipiaoquerenTime,
+ new SqlParameter("@KaipiaoquerenCreater",trueModel.KaipiaoquerenCreater),
+ new SqlParameter("@BusinessManagerId",trueModel.BusinessManagerId),
+ new SqlParameter("@Creater",trueModel.Creater),
+ new SqlParameter("@CreateTime",trueModel.CreateTime),
+ new SqlParameter("@Updater",trueModel.Updater),
+ new SqlParameter("@LastUpdateTime",trueModel.LastUpdateTime),
+ new SqlParameter("@SellerOrderId",trueModel.SellerOrderId),
+ new SqlParameter("@remark",trueModel.remark),
+ new SqlParameter("@Fapiaohaoma",trueModel.Fapiaohaoma),
+ new SqlParameter("@Jine",trueModel.Jine.HasValue?trueModel.Jine.Value:0),
+ new SqlParameter("@Kaipiaoshuoming",trueModel.Kaipiaoshuoming),
+ new SqlParameter("@dizhidianhua",trueModel.dizhidianhua),
+ new SqlParameter("@Kaihuhang",trueModel.Kaihuhang),
+ new SqlParameter("@Shoukuanjine",trueModel.Shoukuanjine.HasValue?trueModel.Shoukuanjine.Value:0),
+ ShoukuanTime,
+ new SqlParameter("@ShoukuanCreater",trueModel.ShoukuanCreater),
+ new SqlParameter("@Chexiaozhuangtai",trueModel.Chexiaozhuangtai.HasValue?trueModel.Chexiaozhuangtai.Value:0),
+ ChexiaoTime,
+ new SqlParameter("@ChexiaoCreater",trueModel.ChexiaoCreater),
+ CuishouTime,
+ new SqlParameter("@CuishouCreater",trueModel.CuishouCreater),
+ };
+ string sql = "Update OA_Kaipiaonew Set [FirmId]=@FirmId,[BuyerId]=@BuyerId,[Kaipiaoshenqing]=@Kaipiaoshenqing,[Kehuqianshou]=@Kehuqianshou,Qianshoutupian=@Qianshoutupian, [KehuqianshouTime]=@KehuqianshouTime, [KehuqianshouCreater]=@KehuqianshouCreater,[KaipiaoquerenTime]=@KaipiaoquerenTime, [KaipiaoquerenCreater]=@KaipiaoquerenCreater,[BusinessManagerId]=@BusinessManagerId, [Creater]=@Creater,[CreateTime]=@CreateTime,[Updater]=@Updater,[LastUpdateTime]=@LastUpdateTime,SellerOrderId=@SellerOrderId,remark=@remark,Fapiaohaoma=@Fapiaohaoma,Jine=@Jine,Kaipiaoshuoming=@Kaipiaoshuoming,dizhidianhua=@dizhidianhua,Kaihuhang=@Kaihuhang,Shoukuanjine=@Shoukuanjine,ShoukuanTime=@ShoukuanTime,ShoukuanCreater=@ShoukuanCreater,Chexiaozhuangtai=@Chexiaozhuangtai,ChexiaoTime=@ChexiaoTime,ChexiaoCreater=@ChexiaoCreater,CuishouTime=@CuishouTime,CuishouCreater=@CuishouCreater 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_Kaipiaonew GetModelByKeyid(int keyid)
+ {
+ try
+ {
+ string condition = " ";
+ if (keyid>0)
+ {
+ condition = " Keyid=" + keyid + "";
+ }
+ else
+ {
+ return null;
+ }
+
+ // return null;//閿欒鏁版嵁杩斾細绌�
+
+ IList<OA_Kaipiaonew> result = _dataBase.SelectModel<OA_Kaipiaonew>("*", "OA_Kaipiaonew", condition) as IList<OA_Kaipiaonew>;//鎵ц鏌ヨ
+
+ 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_Kaipiaonew> SelectAllModel(Infrastructure.Query.Query query)
+ {
+ return _dataBase.SelectModel<Model.OA_Kaipiaonew>(" * ", " OA_Kaipiaonew ") as IList<Model.OA_Kaipiaonew>;//鎵ц鏌ヨ
+ }
+
+ /// <summary>
+ /// 鍏ㄩ儴鏌ヨ
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.OA_Kaipiaonew> GetModelBySellerOrderId(int SellerOrderId)
+ {
+ return _dataBase.SelectModel<Model.OA_Kaipiaonew>(" * ", " OA_Kaipiaonew ", " CHARINDEX(',"+ SellerOrderId + ",', SellerOrderId ) > 0 ") as IList<Model.OA_Kaipiaonew>;//鎵ц鏌ヨ
+ }
+
+
+ /// <summary>
+ /// 鍒嗛〉鏌ヨ
+ /// </summary>
+ /// <param name="query"></param>
+ /// <param name="pagination"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.OA_Kaipiaonew> 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_Kaipiaonew>(pagination, SELECTTARGET, fromSouce, orderbys[0], resultOrderBy);
+ }
+
+ /// <summary>
+ /// 鍒犻櫎
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public bool DeleteModel(Infrastructure.Domain.IAggregateRoot model)
+ {
+ Model.OA_Kaipiaonew trueModel = model as Model.OA_Kaipiaonew;
+ if (trueModel == null)
+ {
+ return false;
+ }
+ IList<SqlParameter> sqlParms = new List<SqlParameter>()
+ {
+ new SqlParameter("@Keyid",trueModel.Keyid)
+ };
+ string sql = "Delete OA_Kaipiaonew 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_KaipiaonewcuishouDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_KaipiaonewcuishouDAL.cs
new file mode 100644
index 0000000..6c5291e
--- /dev/null
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_KaipiaonewcuishouDAL.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_KaipiaonewcuishouDAL : IOA_KaipiaonewcuishouDAL
+ {
+ 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_Kaipiaonewcuishou] 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_KaipiaonewcuishouDAL()
+ {
+ _dataBase = new Database();
+ }
+
+ /// <summary>
+ /// 鏂板
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public bool InserModel(Infrastructure.Domain.IAggregateRoot model)
+ {
+ Model.OA_Kaipiaonewcuishou trueModel = model as Model.OA_Kaipiaonewcuishou;
+ if (trueModel == null)
+ {
+ return false;
+ }
+
+
+ IList<SqlParameter> sqlParms = new List<SqlParameter>()
+ {
+
+
+ new SqlParameter("@KaipiaoId",trueModel.KaipiaoId),
+
+ new SqlParameter("@CreateTime",trueModel.CreateTime),
+
+ new SqlParameter("@CuishouTime",trueModel.CuishouTime),
+ new SqlParameter("@Creater",trueModel.Creater),
+
+
+ };
+ string sql = "Insert Into OA_Kaipiaonewcuishou ( [KaipiaoId] , [Creater],[CreateTime],[CuishouTime] )"
+ + " Values ( @KaipiaoId, @Creater,@CreateTime,@CuishouTime )";
+ 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_Kaipiaonewcuishou trueModel = model as Model.OA_Kaipiaonewcuishou;
+ 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),
+
+ };
+ string sql = "Update OA_Kaipiaonewcuishou Set [Creater]=@Creater,[CreateTime]=@CreateTime,[CuishouTime]=@CuishouTime 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_Kaipiaonewcuishou GetModelByKeyid(int keyid)
+ {
+ try
+ {
+ string condition = " ";
+ if (keyid>0)
+ {
+ condition = " Keyid=" + keyid + "";
+ }
+ else
+ {
+ return null;
+ }
+
+ // return null;//閿欒鏁版嵁杩斾細绌�
+
+ IList<OA_Kaipiaonewcuishou> result = _dataBase.SelectModel<OA_Kaipiaonewcuishou>("*", "OA_Kaipiaonewcuishou", condition) as IList<OA_Kaipiaonewcuishou>;//鎵ц鏌ヨ
+
+ 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_Kaipiaonewcuishou> SelectAllModel(Infrastructure.Query.Query query)
+ {
+ return _dataBase.SelectModel<Model.OA_Kaipiaonewcuishou>(" * ", " OA_Kaipiaonewcuishou ") as IList<Model.OA_Kaipiaonewcuishou>;//鎵ц鏌ヨ
+ }
+
+ /// <summary>
+ /// 鍏ㄩ儴鏌ヨ
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.OA_Kaipiaonewcuishou> GetModelByKaipiaoId(string KaipiaoId)
+ {
+ return _dataBase.SelectModel<Model.OA_Kaipiaonewcuishou>(" * ", " OA_Kaipiaonewcuishou ", " KaipiaoId = '" + KaipiaoId + "' order by CreateTime desc ") as IList<Model.OA_Kaipiaonewcuishou>;//鎵ц鏌ヨ
+ }
+
+
+ /// <summary>
+ /// 鍒嗛〉鏌ヨ
+ /// </summary>
+ /// <param name="query"></param>
+ /// <param name="pagination"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.OA_Kaipiaonewcuishou> 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_Kaipiaonewcuishou>(pagination, SELECTTARGET, fromSouce, orderbys[0], resultOrderBy);
+ }
+
+ /// <summary>
+ /// 鍒犻櫎
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public bool DeleteModel(Infrastructure.Domain.IAggregateRoot model)
+ {
+ Model.OA_Kaipiaonewcuishou trueModel = model as Model.OA_Kaipiaonewcuishou;
+ if (trueModel == null)
+ {
+ return false;
+ }
+ IList<SqlParameter> sqlParms = new List<SqlParameter>()
+ {
+ new SqlParameter("@Keyid",trueModel.Keyid)
+ };
+ string sql = "Delete OA_Kaipiaonewcuishou 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_KaipiaonewhuikuanDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_KaipiaonewhuikuanDAL.cs
new file mode 100644
index 0000000..1351b70
--- /dev/null
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_KaipiaonewhuikuanDAL.cs
@@ -0,0 +1,236 @@
+锘縰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_KaipiaonewhuikuanDAL : IOA_KaipiaonewhuikuanDAL
+ {
+ 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_Kaipiaonewhuikuan] 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_KaipiaonewhuikuanDAL()
+ {
+ _dataBase = new Database();
+ }
+
+ /// <summary>
+ /// 鏂板
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public bool InserModel(Infrastructure.Domain.IAggregateRoot model)
+ {
+ Model.OA_Kaipiaonewhuikuan trueModel = model as Model.OA_Kaipiaonewhuikuan;
+ if (trueModel == null)
+ {
+ return false;
+ }
+
+
+ IList<SqlParameter> sqlParms = new List<SqlParameter>()
+ {
+
+
+ new SqlParameter("@KaipiaoId",trueModel.KaipiaoId),
+
+ new SqlParameter("@CreateTime",trueModel.CreateTime),
+
+ new SqlParameter("@huikuanTime",trueModel.huikuanTime),
+ new SqlParameter("@Creater",trueModel.Creater),
+ new SqlParameter("@Huikuanmoney",trueModel.Huikuanmoney),
+
+
+ };
+ string sql = "Insert Into OA_Kaipiaonewhuikuan ( [KaipiaoId] , [Creater],[CreateTime],[huikuanTime],Huikuanmoney )"
+ + " Values ( @KaipiaoId, @Creater,@CreateTime,@huikuanTime,@Huikuanmoney )";
+ 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_Kaipiaonewhuikuan trueModel = model as Model.OA_Kaipiaonewhuikuan;
+ if (trueModel == null)
+ {
+ return false;
+ }
+
+
+ IList<SqlParameter> sqlParms = new List<SqlParameter>()
+ {
+
+ new SqlParameter("@Keyid",trueModel.Keyid),
+
+
+ new SqlParameter("@CreateTime",trueModel.CreateTime),
+
+ new SqlParameter("@huikuanTime",trueModel.huikuanTime),
+ new SqlParameter("@Creater",trueModel.Creater),
+ new SqlParameter("@Huikuanmoney",trueModel.Huikuanmoney),
+
+ };
+ string sql = "Update OA_Kaipiaonewhuikuan Set [Creater]=@Creater,[CreateTime]=@CreateTime,[huikuanTime]=@huikuanTime,Huikuanmoney=@Huikuanmoney 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_Kaipiaonewhuikuan GetModelByKeyid(int keyid)
+ {
+ try
+ {
+ string condition = " ";
+ if (keyid > 0)
+ {
+ condition = " Keyid=" + keyid + "";
+ }
+ else
+ {
+ return null;
+ }
+
+ // return null;//閿欒鏁版嵁杩斾細绌�
+
+ IList<OA_Kaipiaonewhuikuan> result = _dataBase.SelectModel<OA_Kaipiaonewhuikuan>("*", "OA_Kaipiaonewhuikuan", condition) as IList<OA_Kaipiaonewhuikuan>;//鎵ц鏌ヨ
+
+ 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_Kaipiaonewhuikuan> SelectAllModel(Infrastructure.Query.Query query)
+ {
+ return _dataBase.SelectModel<Model.OA_Kaipiaonewhuikuan>(" * ", " OA_Kaipiaonewhuikuan ") as IList<Model.OA_Kaipiaonewhuikuan>;//鎵ц鏌ヨ
+ }
+
+ /// <summary>
+ /// 鍏ㄩ儴鏌ヨ
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.OA_Kaipiaonewhuikuan> GetModelByKaipiaoId(string KaipiaoId)
+ {
+ return _dataBase.SelectModel<Model.OA_Kaipiaonewhuikuan>(" * ", " OA_Kaipiaonewhuikuan ", " KaipiaoId = '" + KaipiaoId + "' order by CreateTime desc ") as IList<Model.OA_Kaipiaonewhuikuan>;//鎵ц鏌ヨ
+ }
+
+
+ /// <summary>
+ /// 鍒嗛〉鏌ヨ
+ /// </summary>
+ /// <param name="query"></param>
+ /// <param name="pagination"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.OA_Kaipiaonewhuikuan> 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_Kaipiaonewhuikuan>(pagination, SELECTTARGET, fromSouce, orderbys[0], resultOrderBy);
+ }
+
+ /// <summary>
+ /// 鍒犻櫎
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public bool DeleteModel(Infrastructure.Domain.IAggregateRoot model)
+ {
+ Model.OA_Kaipiaonewhuikuan trueModel = model as Model.OA_Kaipiaonewhuikuan;
+ if (trueModel == null)
+ {
+ return false;
+ }
+ IList<SqlParameter> sqlParms = new List<SqlParameter>()
+ {
+ new SqlParameter("@Keyid",trueModel.Keyid)
+ };
+ string sql = "Delete OA_Kaipiaonewhuikuan 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_KipiaoshenqingDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_KipiaoshenqingDAL.cs
index 8877a76..7f3ad88 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_KipiaoshenqingDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_KipiaoshenqingDAL.cs
@@ -24,10 +24,10 @@
/// 鏌ヨ鏉ユ簮
/// </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 " +
+ " oe.CompanyName as BuyerName, os.Name as BusinessManager " +//,eo.shuliang,eo.jine
" from [OA_Kaipiaoshenqing] 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 (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) " +
@@ -36,7 +36,7 @@
/// <summary>
/// 鍒嗛〉榛樿鎺掑簭瀛楁
/// </summary>
- const string ORDERBY = " SellerOrderId desc ";
+ const string ORDERBY = " CreateTime desc ";
#endregion
public OA_KipiaoshenqingDAL()
{
@@ -94,10 +94,15 @@
new SqlParameter("@Creater",trueModel.Creater),
new SqlParameter("@SellerOrderId",trueModel.SellerOrderId),
new SqlParameter("@remark",trueModel.remark),
+ new SqlParameter("@ApprovalStatus",trueModel.ApprovalStatus),
+ new SqlParameter("@Zengjianmoney",trueModel.Zengjianmoney),
+ new SqlParameter("@Dingdanshu",trueModel.Dingdanshu.HasValue?trueModel.Dingdanshu.Value:0),
+ new SqlParameter("@kpmoney",trueModel.kpmoney),
+ new SqlParameter("@Huikuanmoney",trueModel.Huikuanmoney.HasValue?trueModel.Huikuanmoney.Value:new decimal(0)),
};
- string sql = "Insert Into OA_Kaipiaoshenqing ([Keyid],[FirmId],[BuyerId],[Kaipiaoshenqing],[Kehuqianshou], [KehuqianshouTime], [KehuqianshouCreater],[KaipiaoquerenTime], [KaipiaoquerenCreater],[BusinessManagerId], [Creater],[CreateTime],[Updater],[LastUpdateTime],[SellerOrderId],remark)"
- + " Values ( @Keyid,@FirmId,@BuyerId,@Kaipiaoshenqing, @Kehuqianshou, @KehuqianshouTime, @KehuqianshouCreater, @KaipiaoquerenTime, @KaipiaoquerenCreater, @BusinessManagerId, @Creater,@CreateTime,@Updater,@LastUpdateTime,@SellerOrderId,@remark )";
+ string sql = "Insert Into OA_Kaipiaoshenqing ([Keyid],[FirmId],[BuyerId],[Kaipiaoshenqing],[Kehuqianshou], [KehuqianshouTime], [KehuqianshouCreater],[KaipiaoquerenTime], [KaipiaoquerenCreater],[BusinessManagerId], [Creater],[CreateTime],[Updater],[LastUpdateTime],[SellerOrderId],remark,ApprovalStatus,Zengjianmoney,Dingdanshu,kpmoney,Huikuanmoney)"
+ + " Values ( @Keyid,@FirmId,@BuyerId,@Kaipiaoshenqing, @Kehuqianshou, @KehuqianshouTime, @KehuqianshouCreater, @KaipiaoquerenTime, @KaipiaoquerenCreater, @BusinessManagerId, @Creater,@CreateTime,@Updater,@LastUpdateTime,@SellerOrderId,@remark,@ApprovalStatus,@Zengjianmoney,@Dingdanshu,@kpmoney,@Huikuanmoney )";
try
{
_dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
@@ -140,6 +145,16 @@
{
KaipiaoquerenTime = new SqlParameter("@KaipiaoquerenTime", DBNull.Value);
}
+ SqlParameter ShoukuanTime = null;
+ if (trueModel.ShoukuanTime.HasValue)
+ {
+ ShoukuanTime = new SqlParameter("@ShoukuanTime", trueModel.ShoukuanTime.Value);
+ }
+ else
+ {
+ ShoukuanTime = new SqlParameter("@ShoukuanTime", DBNull.Value);
+ }
+
IList<SqlParameter> sqlParms = new List<SqlParameter>()
{
@@ -158,9 +173,15 @@
new SqlParameter("@Updater",trueModel.Updater),
new SqlParameter("@LastUpdateTime",trueModel.LastUpdateTime),
new SqlParameter("@Creater",trueModel.Creater),
+ new SqlParameter("@ApprovalStatus",trueModel.ApprovalStatus),
+ new SqlParameter("@Zengjianmoney",trueModel.Zengjianmoney),
+ new SqlParameter("@Kehuqianshoutupian",string.IsNullOrEmpty(trueModel.Kehuqianshoutupian)?"":trueModel.Kehuqianshoutupian),
+ new SqlParameter("@Fapiaohao",string.IsNullOrEmpty(trueModel.Fapiaohao)?"":trueModel.Fapiaohao),
+ new SqlParameter("@Huikuanmoney",trueModel.Huikuanmoney.HasValue?trueModel.Huikuanmoney.Value:new decimal(0)),
+ ShoukuanTime,
};
- string sql = "Update OA_Kaipiaoshenqing Set [FirmId]=@FirmId,[BuyerId]=@BuyerId,[Kaipiaoshenqing]=@Kaipiaoshenqing,[Kehuqianshou]=@Kehuqianshou, [KehuqianshouTime]=@KehuqianshouTime, [KehuqianshouCreater]=@KehuqianshouCreater,[KaipiaoquerenTime]=@KaipiaoquerenTime, [KaipiaoquerenCreater]=@KaipiaoquerenCreater,[BusinessManagerId]=@BusinessManagerId, [Creater]=@Creater,[CreateTime]=@CreateTime,[Updater]=@Updater,[LastUpdateTime]=@LastUpdateTime where [Keyid] =@Keyid ";
+ string sql = "Update OA_Kaipiaoshenqing Set [FirmId]=@FirmId,[BuyerId]=@BuyerId,[Kaipiaoshenqing]=@Kaipiaoshenqing,[Kehuqianshou]=@Kehuqianshou, [KehuqianshouTime]=@KehuqianshouTime, [KehuqianshouCreater]=@KehuqianshouCreater,[KaipiaoquerenTime]=@KaipiaoquerenTime, [KaipiaoquerenCreater]=@KaipiaoquerenCreater,[BusinessManagerId]=@BusinessManagerId, [Creater]=@Creater,[CreateTime]=@CreateTime,[Updater]=@Updater,[LastUpdateTime]=@LastUpdateTime,ApprovalStatus=@ApprovalStatus,Zengjianmoney=@Zengjianmoney,Kehuqianshoutupian=@Kehuqianshoutupian,Fapiaohao=@Fapiaohao,Huikuanmoney=@Huikuanmoney,ShoukuanTime=@ShoukuanTime where [Keyid] =@Keyid ";
try
{
diff --git a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
index ef2b784..fa855a3 100644
--- a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
+++ b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
@@ -1883,6 +1883,9 @@
<Content Include="Pages\business\BackVisitNoteEdit.aspx" />
<Content Include="Pages\business\BargainPrice.aspx" />
<Content Include="Pages\business\BargainPriceByFirm.aspx" />
+ <Content Include="Pages\business\InvoicingHuikuan.aspx" />
+ <Content Include="Pages\business\InvoicingCuishou.aspx" />
+ <Content Include="Pages\business\OrderListBatchKaipiao.aspx" />
<Content Include="Pages\business\WorkBookUpLoad.aspx" />
<Content Include="Pages\business\DeliverWorkBookSonghuo.aspx" />
<Content Include="Pages\business\DeliverWorkBookPrint.aspx" />
@@ -2037,6 +2040,7 @@
<Content Include="Pages\financial\MemberOrderMoneyReceive.aspx" />
<Content Include="Pages\financial\MemberOrderPayList.aspx" />
<Content Include="Pages\financial\OrderFinancialPrint.aspx" />
+ <Content Include="Pages\financial\InvoicingShoukuan.aspx" />
<Content Include="Pages\financial\OrderMoneyBatchReceive.aspx" />
<Content Include="Pages\financial\OutsourcePayMoney.aspx" />
<Content Include="Pages\financial\OutsourcePayOrder.aspx" />
@@ -3285,6 +3289,27 @@
<Compile Include="Pages\business\BargainPriceByFirm.aspx.designer.cs">
<DependentUpon>BargainPriceByFirm.aspx</DependentUpon>
</Compile>
+ <Compile Include="Pages\business\InvoicingHuikuan.aspx.cs">
+ <DependentUpon>InvoicingHuikuan.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\business\InvoicingHuikuan.aspx.designer.cs">
+ <DependentUpon>InvoicingHuikuan.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="Pages\business\InvoicingCuishou.aspx.cs">
+ <DependentUpon>InvoicingCuishou.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\business\InvoicingCuishou.aspx.designer.cs">
+ <DependentUpon>InvoicingCuishou.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="Pages\business\OrderListBatchKaipiao.aspx.cs">
+ <DependentUpon>OrderListBatchKaipiao.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\business\OrderListBatchKaipiao.aspx.designer.cs">
+ <DependentUpon>OrderListBatchKaipiao.aspx</DependentUpon>
+ </Compile>
<Compile Include="Pages\business\WorkBookUpLoad.aspx.cs">
<DependentUpon>WorkBookUpLoad.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -4363,6 +4388,13 @@
<Compile Include="Pages\financial\OrderFinancialPrint.aspx.designer.cs">
<DependentUpon>OrderFinancialPrint.aspx</DependentUpon>
</Compile>
+ <Compile Include="Pages\financial\InvoicingShoukuan.aspx.cs">
+ <DependentUpon>InvoicingShoukuan.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\financial\InvoicingShoukuan.aspx.designer.cs">
+ <DependentUpon>InvoicingShoukuan.aspx</DependentUpon>
+ </Compile>
<Compile Include="Pages\financial\OrderMoneyBatchReceive.aspx.cs">
<DependentUpon>OrderMoneyBatchReceive.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
diff --git a/CY_ECommercePlatform/CY.WebForm/MainPage.cs b/CY_ECommercePlatform/CY.WebForm/MainPage.cs
index 7f4fd2e..8066e29 100644
--- a/CY_ECommercePlatform/CY.WebForm/MainPage.cs
+++ b/CY_ECommercePlatform/CY.WebForm/MainPage.cs
@@ -213,6 +213,28 @@
/// <summary>
+ /// 鏄剧ず瀵硅瘽妗�
+ /// </summary>
+ /// <param name="Message">娑堟伅</param>
+ /// <param name="page"></param>
+ /// <param name="IsClose">鏄惁鍏抽棴</param>
+ /// <param name="IsRefreshParent">鏄惁鍒锋柊鐖剁獥鍙�</param>
+ public static void MessageBoxsssss(string Message, System.Web.UI.Page page, bool IsClose, bool IsRefreshParent)
+ {
+ string jsfn = "";
+ if (IsClose && IsRefreshParent)
+ jsfn = "top.frmright.document.getElementById('btn_Search').click();top.Dialog.close();";
+ else if (IsClose)
+ jsfn = "top.Dialog.close();";
+ else if (IsRefreshParent)
+ jsfn = "top.frmright.document.getElementById('btn_Search').click();";
+
+ string script = string.Format("alertMsg('{0}');{1}", Message, jsfn);
+ JavaScript.ExecuteClientScript("key", script, page);
+ }
+
+
+ /// <summary>
/// 鏄剧ず瀵硅瘽妗�,缁欑埗椤甸潰鎺т欢璧嬪��
/// </summary>
/// <param name="Message">娑堟伅</param>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
index 30d6ea5..3f1603b 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
@@ -221,14 +221,14 @@
</tr>
<tr>
<td>
- <select keepdefaultstyle="true" class="" name="PSF_Component">
+ <select keepdefaultstyle="true" class="" name="PSF_Component" value_ppwaerid="<%#Container.ItemIndex + 1%>">
<option value="" selected="selected">-鏃�-</option>
<option value="灏侀潰">灏侀潰</option>
<option value="鍐呴〉">鍐呴〉</option>
</select>
</td>
<td colspan="2">
- <input type="text" class=" w80px int " msg="璇峰～鍐欐暟瀛�" name="PSF_PNum" value="<%#Eval("PSF_PNum")%>" />
+ <input type="text" class=" w80px int " msg="璇峰～鍐欐暟瀛�" name="PSF_PNum" value="<%#Eval("PSF_PNum")%>" value_ppwaerid="<%#Container.ItemIndex + 1%>" />
</td>
<td colspan="2">
<select keepdefaultstyle="true" class=" w120px" name="PSF_PressesDesk" value_selspec="<%#Container.ItemIndex + 1%>">
@@ -584,6 +584,8 @@
$(".CTPSpecName").last().attr("value_ppwaerid", value_id + 1);
$(".CTPCount").last().attr("value_ppwaerid", value_id + 1);
$(".lbCTPCount").last().attr("value_ppwaerid", value_id + 1);
+ $("select[name='PSF_Component']").last().attr("value_ppwaerid", value_id + 1);
+ $("input[name='PSF_PNum']").last().attr("value_ppwaerid", value_id + 1);
$(".tdCTPCount").last().attr("value_ppwaerid", value_id + 1);
$(".selCTPSpec").last().attr("value_ppwaerid", value_id + 1);
$(".selFilmSpec").last().attr("value_ppwaerid", value_id + 1);
@@ -624,7 +626,10 @@
$("input[name='CTPSpecName']").last().val("395*460");
$("select[name='PSF_PressesDesk']").last().change();
- // $("select[name='PSF_Component']").last().val("鍐呴〉");
+ if ($("select[name='PSF_Component']").first().val() == "灏侀潰") {
+ $("select[name='PSF_Component']").last().val("鍐呴〉");
+ }
+
$("input[name='PSF_PNum']").last().val("");
$("input[name='PSF_PaperName']").last().val("");
$("input[name='PSF_MaterialSpecifications']").last().val("");
@@ -664,6 +669,21 @@
}
});
+
+ $("select[name='PSF_Component']").live("change", function () {
+ var value_SelWaerId = $(this).attr("value_ppwaerid");
+
+ if ($(this).val() == "灏侀潰") {
+ $("input[name='PSF_PNum'][value_ppwaerid='" + value_SelWaerId + "']").val("4");
+
+
+
+ } else {
+ $("input[name='PSF_PNum'][value_ppwaerid='" + value_SelWaerId + "']").val("");
+ }
+ });
+
+
$("select[name='selPlateType']").live("change", function () {
var value_SelWaerId = $(this).attr("value_selwaerid");
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingApply.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingApply.aspx.cs
index e74cbce..43d323c 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingApply.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingApply.aspx.cs
@@ -581,7 +581,7 @@
PageSize = UCPager1.AspNetPager.PageSize,
PageIndex = UCPager1.AspNetPager.CurrentPageIndex
};
- IEnumerable<OA_Kaipiaoshenqing> result = oA_KaipiaoshenqingBLL.SelectModelPage(pagination, CurrentUser.MemberId,this.txtSQBeginDate.Value, this.txtSQEndDate.Value,this.selKaipiaoshenqing.Value, this.selKehuqianshou.Value,this.selBusinessManager.Value,this.txtCustormerName.Value);
+ IEnumerable<OA_Kaipiaoshenqing> result = oA_KaipiaoshenqingBLL.SelectModelPage(pagination, CurrentUser.MemberId,this.txtSQBeginDate.Value, this.txtSQEndDate.Value,this.selKaipiaoshenqing.Value, this.selKehuqianshou.Value,this.selBusinessManager.Value,this.txtCustormerName.Value,"","");
rptData.DataSource = result;
rptData.DataBind();
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingApplyPrint.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingApplyPrint.aspx.cs
index 1f81f55..f11d450 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingApplyPrint.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingApplyPrint.aspx.cs
@@ -102,7 +102,7 @@
PageSize = 1000,
PageIndex = 1
};
- IEnumerable<OA_Kaipiaoshenqing> result = oA_KaipiaoshenqingBLL.SelectModelPage(pagination, CurrentUser.MemberId, SQBeginDate, SQEndDate, Kaipiaoshenqing, Kehuqianshou, BusinessManager, CustormerName);
+ IEnumerable<OA_Kaipiaoshenqing> result = oA_KaipiaoshenqingBLL.SelectModelPage(pagination, CurrentUser.MemberId, SQBeginDate, SQEndDate, Kaipiaoshenqing, Kehuqianshou, BusinessManager, CustormerName,"","");
//IEnumerable<EC_OrderBasic> result = _eC_OrderBasicBLL.SelectModelPage_Seller(pagination, SearchParam);
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx
index fa433d6..4d4810c 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx
@@ -73,12 +73,32 @@
// top.Dialog.open({ URL: '/Pages/business/InvoicingConfirmEdit.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/InvoicingConfirmEdit.aspx?id=" + personId, Title: "纭鍙戠エ", Width: 400, Height: 600 });
}
+
+ //鍌敹
+ function ViewCuishou(personId) {
+ top.Dialog.open({ URL: "/Pages/business/InvoicingCuishou.aspx?id=" + personId, Title: "鍌", Width: 400, Height: 600 });
+ }
+ //鏀舵
+ function ViewShoukuan(personId) {
+ top.Dialog.open({ URL: "/Pages/financial/InvoicingShoukuan.aspx?id=" + personId, Title: "鏀舵", Width: 600, Height: 800 });
+ }
+
+ //鍥炴
+ function ViewFukuan(personId) {
+ top.Dialog.open({ URL: "/Pages/business/InvoicingHuikuan.aspx?id=" + personId, Title: "浠樻鐧昏", Width: 400, Height: 600 });
+ }
+
+
//鏌ョ湅瀹㈡埛璧勬枡
function Viewkaipiao(Keyid, SellerOrderId) {
window.open("/Pages/business/InvoicingOrderPrint.aspx?Keyid=" + Keyid + "&SellerOrderId=" + SellerOrderId, '', '');
@@ -129,7 +149,19 @@
<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>
+ <input id='txtCustormerName' runat="server" maxlength='50' />
+ </td>
+ <td class="ali03">
+ 涓氬姟缁忕悊锛�
+ </td>
+ <td>
+ <select keepdefaultstyle='true' id='selBusinessManager' runat="server" datatextfield='Name' datavaluefield='Keyid'>
+ </select>
+ </td>
<td class="ali03">
寮�绁ㄧ姸鎬侊細
</td>
@@ -137,7 +169,24 @@
<select keepdefaultstyle='true' class=' firstfocus' id='selKaipiaoshenqing' runat="server" datatextfield="Name" datavaluefield="MeanValue">
</select>
</td>
- <td class="ali03">
+
+
+
+
+
+ </tr>
+ <tr style="padding-left: 50px">
+ <td class="ali03">
+ 鏄惁閿�璐︼細
+ </td>
+ <td>
+ <select keepdefaultstyle='true' id='selPayStates' runat="server" >
+ <option value="">鍏ㄩ儴</option>
+ <option value="2">鏄�</option>
+ <option value="1">鍚�</option>
+ </select>
+ </td>
+ <td class="ali03">
瀹㈡埛绛炬敹锛�
</td>
<td>
@@ -145,34 +194,22 @@
</select>
</td>
<td class="ali03">
- <%-- 鏀舵鐘舵�侊細--%>
+ 鏄惁鍥炴锛�
</td>
<td>
- <%-- <select keepdefaultstyle='true' id='selPayStates' runat="server" datatextfield="Name" datavaluefield="MeanValue">
- </select>--%>
- </td>
-
-
-
- </tr>
- <tr style="padding-left: 50px">
- <td class="ali03">
- 瀹㈡埛鍚嶇О锛�
- </td>
- <td>
- <input id='txtCustormerName' runat="server" maxlength='50' />
- </td>
-
- <td class="ali03">
- 涓氬姟缁忕悊锛�
- </td>
- <td>
- <select keepdefaultstyle='true' id='selBusinessManager' runat="server" datatextfield='Name' datavaluefield='Keyid'>
+ <select keepdefaultstyle='true' id='selHuikuanStates' runat="server" >
+ <option value="">鍏ㄩ儴</option>
+ <option value="2">鏄�</option>
+ <option value="1">鍚�</option>
</select>
</td>
+
-
- <td colspan="4">
+ <td >
+
+
+ </td>
+ <td >
<asp:button id="btn_Search" text="鏌ヨ" runat="server" /> <input type="button" value='閲嶇疆' onclick='document.body.innerHTML="";window.location=window.location;' />
</td>
@@ -212,26 +249,37 @@
<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 width="36">
璁㈠崟鏁伴噺
</th>
<th width="60">
閲戦
</th>
-
-
+ <th width="60">
+ 澧炲噺閲戦
+ </th>
+ <th width="60">
+ 绛惧崟鍥炴墽
+ </th>
+ <th width="60">
+ 鍥炴閲戦
+ </th>
+ <th width="60">
+ 鏈�杩戝偓娆�
+ </th>
+
<th width="60">
寮�绁ㄧ姸鎬�
</th>
- <th width="60">
- 瀹㈡埛绛炬敹
+ <th width="120">
+ 鎿嶄綔
</th>
@@ -255,27 +303,44 @@
</td>
- <td style="text-align: center;">
- <%#Eval("SellerOrderId")%>
-
-
- </td>
+
<td style="text-align: center;">
<div style="width: 140px; word-wrap: break-word; text-align:justify;">
<a href='javascript:void(0)' title='鐐瑰嚮鏌ョ湅 <%#Eval("BuyerName").ToString()%> 璧勬枡' class='a_under' onclick='View("<%#Eval("BuyerId")%>")'><%#Eval("BuyerName").ToString().Length > 10 ? (Eval("BuyerName").ToString().Substring(0, 10) + "..") : Eval("BuyerName").ToString()%></a>
</div>
</td>
+ <td >
+ <%#Eval("Fapiaohao")%>
+
+
+ </td>
<td>
- <a href='javascript:void(0)' title=' <%#Eval("shuliang")%> ' class='a_under' onclick='Viewkaipiao("<%#Eval("Keyid")%>","<%#Eval("SellerOrderId")%>")'> <%#Eval("shuliang")%> </a>
+ <a href='javascript:void(0)' title=' <%#Eval("Dingdanshu")%> ' class='a_under' onclick='Viewkaipiao("<%#Eval("Keyid")%>","<%#Eval("SellerOrderId")%>")'> <%#Eval("Dingdanshu")%> </a>
</td>
<td>
- <%#Eval("jine", "{0:F}")%>
+ <%#Eval("kpmoney", "{0:F}")%>
+ </td>
+ <td>
+ <%#Eval("Zengjianmoney", "{0:F}")%>
+ </td>
+ <td>
+ <%#Eval("Kehuqianshou").ToString()=="1"?"<a href='javascript:void(0)' title='涓婁紶鍥炴墽' class='a_under' onclick='Viewkehuqianshou(\""+Eval("Keyid")+"\",\""+Eval("SellerOrderId")+"\") '> 涓婁紶鍥炴墽 </a>":" <a title='鐐瑰嚮鏌ョ湅鍘熷浘' href='"+Eval("Kehuqianshoutupian")+"' target='view_window'> <img width='25' height='20' src='"+Eval("Kehuqianshoutupian")+"' /> </a> "%>
+
+
+
+
+ </td>
+ <td>
+ <%#Eval("Huikuanmoney", "{0:F}")%>
+ </td>
+ <td>
+ <%#Eval("ShoukuanTime", "{0:MM-dd HH:mm}")%>
</td>
<td>
@@ -289,9 +354,9 @@
</td>
<td>
-
- <%#Eval("KehuqianshouName")%>
-
+ <a href='javascript:void(0)' title='浠樻鐧昏' class='a_under' onclick='ViewFukuan("<%#Eval("Keyid")%>")'> 浠樻鐧昏 </a>
+ <a href='javascript:void(0)' title='鍌' class='a_under' onclick='ViewCuishou("<%#Eval("Keyid")%>")'> 鍌 </a>
+ <a href='javascript:void(0)' title='鏀舵' class='a_under' onclick='ViewShoukuan("<%#Eval("Keyid")%>")'> 鏀舵 </a>
</td>
</tr>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx.cs
index c500e4c..1b70e3c 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx.cs
@@ -471,8 +471,11 @@
this.selKaipiaoshenqing.DataSource = _sys_DictionaryBLL.GetDataByType("EC_寮�绁ㄧ敵璇�");
this.selKaipiaoshenqing.DataBind();
this.selKaipiaoshenqing.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
- this.selKaipiaoshenqing.Value = "1";
+ //this.selKaipiaoshenqing.Value = "1";
+ //this.selPayStates.Value = "1";
+ //this.selHuikuanStates.Value = "1";
+
this.selBusinessManager.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, true, false);
@@ -578,7 +581,7 @@
PageSize = UCPager1.AspNetPager.PageSize,
PageIndex = UCPager1.AspNetPager.CurrentPageIndex
};
- IEnumerable<OA_Kaipiaoshenqing> result = oA_KaipiaoshenqingBLL.SelectModelPage(pagination, CurrentUser.MemberId, this.txtSQBeginDate.Value, this.txtSQEndDate.Value, this.selKaipiaoshenqing.Value, this.selKehuqianshou.Value, this.selBusinessManager.Value, this.txtCustormerName.Value);
+ IEnumerable<OA_Kaipiaoshenqing> result = oA_KaipiaoshenqingBLL.SelectModelPage(pagination, CurrentUser.MemberId, this.txtSQBeginDate.Value, this.txtSQEndDate.Value, this.selKaipiaoshenqing.Value, this.selKehuqianshou.Value, this.selBusinessManager.Value, this.txtCustormerName.Value, this.selPayStates.Value, this.selHuikuanStates.Value );
rptData.DataSource = result;
rptData.DataBind();
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx.designer.cs
index 4839ff7..36bea9f 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx.designer.cs
@@ -60,24 +60,6 @@
protected global::System.Web.UI.HtmlControls.HtmlInputText txtSQEndDate;
/// <summary>
- /// selKaipiaoshenqing 鎺т欢銆�
- /// </summary>
- /// <remarks>
- /// 鑷姩鐢熸垚鐨勫瓧娈点��
- /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
- /// </remarks>
- protected global::System.Web.UI.HtmlControls.HtmlSelect selKaipiaoshenqing;
-
- /// <summary>
- /// selKehuqianshou 鎺т欢銆�
- /// </summary>
- /// <remarks>
- /// 鑷姩鐢熸垚鐨勫瓧娈点��
- /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
- /// </remarks>
- protected global::System.Web.UI.HtmlControls.HtmlSelect selKehuqianshou;
-
- /// <summary>
/// txtCustormerName 鎺т欢銆�
/// </summary>
/// <remarks>
@@ -96,6 +78,42 @@
protected global::System.Web.UI.HtmlControls.HtmlSelect selBusinessManager;
/// <summary>
+ /// selKaipiaoshenqing 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selKaipiaoshenqing;
+
+ /// <summary>
+ /// selPayStates 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selPayStates;
+
+ /// <summary>
+ /// selKehuqianshou 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selKehuqianshou;
+
+ /// <summary>
+ /// selHuikuanStates 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selHuikuanStates;
+
+ /// <summary>
/// btn_Search 鎺т欢銆�
/// </summary>
/// <remarks>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirmEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirmEdit.aspx
index 19d7393..e8ee857 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirmEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirmEdit.aspx
@@ -22,13 +22,13 @@
<label runat="server" id="txtkaipiaoshijian"></label>
</td>
</tr>
- <tr>
+ <%-- <tr>
<td colspan='2' class='col_third' '>
寮�绁ㄧ敵璇峰崟鍙凤細
<label runat="server" id="txtSellerOrderId"></label>
</td>
- </tr>
+ </tr>--%>
<tr>
<td colspan='2' class='col_third' '>
瀹㈡埛鍗曚綅锛�
@@ -55,6 +55,10 @@
</td>
</tr>
+ <tr >
+ <td class="contentLeft" colspan='2' >鍙戠エ鍙风爜锛�<input id='txtFapiaohao' runat="server" maxlength='50' /></td>
+
+ </tr>
<tr>
<td class="contentLeft" colspan='2'>
　　　　　<input type="button" value="纭鍙戠エ" runat="server" id='btnSubmit' />
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirmEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirmEdit.aspx.cs
index 71fc301..c275dd5 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirmEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirmEdit.aspx.cs
@@ -71,6 +71,11 @@
void btnSubmit_ServerClick(object sender, EventArgs e)
{
string orderIds = Request["ids"];
+ if (string.IsNullOrEmpty(this.txtFapiaohao.Value.Trim()))
+ {
+ JavaScript.MessageBox("璇疯緭鍏ュ彂绁ㄥ彿锛�", this);
+ return;
+ }
bool isWin = false;
OA_Kaipiaoshenqing oA_Kaipiaoshenqing = oA_KaipiaoshenqingBLL.GetModelByKeyid(orderIds.ToGuid2());
@@ -81,12 +86,18 @@
oA_Kaipiaoshenqing.Kaipiaoshenqing = 3;
oA_Kaipiaoshenqing.KaipiaoquerenCreater = CurrentUser.TrueMemberId;
oA_Kaipiaoshenqing.KaipiaoquerenTime = DateTime.Now;
+ oA_Kaipiaoshenqing.Fapiaohao = this.txtFapiaohao.Value.Trim();
isWin = oA_KaipiaoshenqingBLL.UpdateModel(oA_Kaipiaoshenqing);
+ EC_OrderExtend model = new EC_OrderExtend();
+ model.KaipiaoshenqingId = oA_Kaipiaoshenqing.Keyid;
+ model.KaipiaoshenqingTime = oA_Kaipiaoshenqing.KaipiaoquerenTime;
+ model.Kaipiaoshenqing = 3;
+ model.KaipiaoshenqingCreater = CurrentUser.TrueMemberId;
-
+ isWin = _eC_OrderBLL.NewUpdateKaipiaoshenqings(model);
if (isWin)
{
@@ -129,70 +140,15 @@
this.txtBusinessManager.InnerText = oA_Staff.Name;
}
this.txtkaipiaoshijian.InnerText = DateTime.Now.ToString("yyyy-MM-dd");
- this.txtSellerOrderId.InnerText = oA_Kaipiaoshenqing.SellerOrderId;
+ //this.txtSellerOrderId.InnerText = oA_Kaipiaoshenqing.SellerOrderId;
+ this.txtshuliang.InnerText = oA_Kaipiaoshenqing.Dingdanshu.ToString();
- Dictionary<int, object> searchParam = new Dictionary<int, object>();
- SetParamValue(searchParam, 1, CurrentUser.MemberId);
- SetParamValue(searchParam, 2, "");
- SetParamValue(searchParam, 3, "");
- SetParamValue(searchParam, 4, "");
- SetParamValue(searchParam, 5, "");
- SetParamValue(searchParam, 6, "");
- SetParamValue(searchParam, 7, "");
- SetParamValue(searchParam, 8, "");
- SetParamValue(searchParam, 9, "");
- SetParamValue(searchParam, 10, "");
- SetParamValue(searchParam, 11, "");
- SetParamValue(searchParam, 12, "");
- SetParamValue(searchParam, 13, "");
- 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, "");
- SetParamValue(searchParam, 23, "");
- SetParamValue(searchParam, 24, "");
- SetParamValue(searchParam, 25, "");
- SetParamValue(searchParam, 26, orderIds.ToGuid2());
- SearchParam = searchParam;
-
-
- /// UCPager1.AspNetPager.CurrentPageIndex = 1;//閲嶇疆椤垫暟
- //鍐嶆鏌ヨ
- // AspNetPager_PageChanged(UCPager1.AspNetPager, new EventArgs());
- Infrastructure.Query.Pagination pagination = new Infrastructure.Query.Pagination()
- {
- PageSize = 1000,// UCPager1.AspNetPager.PageSize,
- PageIndex = 1// UCPager1.AspNetPager.CurrentPageIndex
- };
- IEnumerable<EC_OrderBasic> result = _eC_OrderBasicBLL.SelectModelPage_Seller(pagination, searchParam);//.Where(x=>x.Quchudingdan == 2);
-
- decimal shoukuanmoney = 0;
- this.txtshuliang.InnerText = result.ToList().Count.ToString();
-
-
-
-
- foreach (EC_OrderBasic eC_OrderBasic in result)
- {
-
-
-
-
- shoukuanmoney += eC_OrderBasic.SumPrice.Value;
-
-
-
- }
- this.txtjine.InnerText = String.Format("{0:F}", shoukuanmoney);
+ this.txtjine.InnerText = String.Format("{0:F}", oA_Kaipiaoshenqing.kpmoney + oA_Kaipiaoshenqing.Zengjianmoney);
}
@@ -204,44 +160,8 @@
}
- /// <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>
- private Dictionary<int, object> SearchParam
- {
- get
- {
- return ViewState["SearchParam"] as Dictionary<int, object>;
- }
- set
- {
- ViewState["SearchParam"] = value;
- }
- }
+
+
}
}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirmEdit.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirmEdit.aspx.designer.cs
index ff11d23..1d13069 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirmEdit.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirmEdit.aspx.designer.cs
@@ -42,15 +42,6 @@
protected global::System.Web.UI.HtmlControls.HtmlGenericControl txtkaipiaoshijian;
/// <summary>
- /// txtSellerOrderId 鎺т欢銆�
- /// </summary>
- /// <remarks>
- /// 鑷姩鐢熸垚鐨勫瓧娈点��
- /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
- /// </remarks>
- protected global::System.Web.UI.HtmlControls.HtmlGenericControl txtSellerOrderId;
-
- /// <summary>
/// txtBuyerName 鎺т欢銆�
/// </summary>
/// <remarks>
@@ -87,6 +78,15 @@
protected global::System.Web.UI.HtmlControls.HtmlGenericControl txtjine;
/// <summary>
+ /// txtFapiaohao 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtFapiaohao;
+
+ /// <summary>
/// btnSubmit 鎺т欢銆�
/// </summary>
/// <remarks>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingCuishou.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingCuishou.aspx
new file mode 100644
index 0000000..9dda4b6
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingCuishou.aspx
@@ -0,0 +1,115 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="InvoicingCuishou.aspx.cs" Inherits="CY.WebForm.Pages.business.InvoicingCuishou" %>
+
+<!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 colspan='2' class='col_third'>
+ 寮�绁ㄦ椂闂达細
+ <label runat="server" id="txtkaipiaoshijian"></label>
+ </td>
+ </tr>
+ <%-- <tr>
+ <td colspan='2' class='col_third' '>
+ 寮�绁ㄧ敵璇峰崟鍙凤細
+ <label runat="server" id="txtSellerOrderId"></label>
+
+ </td>
+ </tr>--%>
+ <tr>
+ <td colspan='2' class='col_third' '>
+ 瀹㈡埛鍗曚綅锛�
+ <label runat="server" id="txtBuyerName"></label>
+
+ </td>
+ </tr>
+ <tr>
+ <td colspan='2' class='col_third' >
+ 涓氬姟缁忕悊锛�
+ <label runat="server" id="txtBusinessManager"></label>
+
+ </td>
+ </tr>
+ <tr>
+ <td class='col_third' >
+ 璁㈠崟鏁伴噺锛�
+ <label runat="server" id="txtshuliang"></label>
+
+ </td>
+ <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'>
+ 　　　　　<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="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("Creater")%>
+
+
+ </td>
+
+
+
+ </tr>
+ </itemtemplate>
+ </asp:repeater>
+ </tbody>
+ </table>
+ </form>
+</body>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingCuishou.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingCuishou.aspx.cs
new file mode 100644
index 0000000..6cefff6
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingCuishou.aspx.cs
@@ -0,0 +1,182 @@
+锘�/**
+* 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 InvoicingCuishou : 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_KaipiaoshenqingBLL oA_KaipiaoshenqingBLL = null;
+ OA_KaipiaonewcuishouBLL oA_KaipiaonewcuishouBLL = null;
+
+ /// <summary>
+ /// 鍒濆鍖栨瀯閫�
+ /// </summary>
+ public InvoicingCuishou()
+ {
+ bll_OA_CorporateClientsBLL = new OA_CorporateClientsBLL();
+ _StaffBLL = new OA_StaffBLL();
+ _eC_OrderBasicBLL = new EC_OrderBasicBLL();
+ oA_KaipiaoshenqingBLL = new OA_KaipiaoshenqingBLL();
+ oA_KaipiaonewcuishouBLL = new OA_KaipiaonewcuishouBLL();
+ }
+ /// <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;
+ OA_Kaipiaoshenqing oA_Kaipiaoshenqing = oA_KaipiaoshenqingBLL.GetModelByKeyid(orderIds.ToGuid2());
+
+
+
+
+ //oA_Kaipiaoshenqing.Kaipiaoshenqing = 3;
+ //oA_Kaipiaoshenqing.KaipiaoquerenCreater = CurrentUser.TrueMemberId;
+ //oA_Kaipiaoshenqing.KaipiaoquerenTime = DateTime.Now;
+ //oA_Kaipiaoshenqing.Fapiaohao = this.txtFapiaohao.Value.Trim();
+
+
+ oA_Kaipiaoshenqing.ShoukuanTime = this.txtStartTime.Value.ToDateTime2();
+
+ isWin = oA_KaipiaoshenqingBLL.UpdateModel(oA_Kaipiaoshenqing);
+
+
+
+
+
+ var oA_Kaipiaonewcuishou = new OA_Kaipiaonewcuishou();
+ oA_Kaipiaonewcuishou.KaipiaoId = oA_Kaipiaoshenqing.Keyid;
+ oA_Kaipiaonewcuishou.Creater = CurrentUser.ShortName;
+ oA_Kaipiaonewcuishou.CreateTime = DateTime.Now;
+ oA_Kaipiaonewcuishou.CuishouTime = oA_Kaipiaoshenqing.ShoukuanTime;
+ isWin = oA_KaipiaonewcuishouBLL.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_Kaipiaoshenqing oA_Kaipiaoshenqing = oA_KaipiaoshenqingBLL.GetModelByKeyid(orderIds.ToGuid2());
+ OA_CorporateClients m_OA_CorporateClients = bll_OA_CorporateClientsBLL.SelectModelByFirmIdandMemberId(CurrentUser.MemberId, oA_Kaipiaoshenqing.BuyerId);
+
+ this.txtBuyerName.InnerText = m_OA_CorporateClients.CompanyName;
+ OA_Staff oA_Staff = _StaffBLL.GetModelByKeyid(oA_Kaipiaoshenqing.BusinessManagerId);
+ if (oA_Staff != null)
+ {
+ this.txtBusinessManager.InnerText = oA_Staff.Name;
+ }
+ this.txtkaipiaoshijian.InnerText = oA_Kaipiaoshenqing.KaipiaoquerenTime.HasValue? oA_Kaipiaoshenqing.KaipiaoquerenTime.Value.ToString("yyyy-MM-dd"):"";
+ //this.txtSellerOrderId.InnerText = oA_Kaipiaoshenqing.SellerOrderId;
+ this.txtshuliang.InnerText = oA_Kaipiaoshenqing.Dingdanshu.ToString();
+
+ this.txtStartTime.Value = DateTime.Now.ToString("yyyy-MM-dd HH:mm");
+
+
+
+
+
+
+ this.txtjine.InnerText = String.Format("{0:F}", oA_Kaipiaoshenqing.kpmoney);
+ var result = oA_KaipiaonewcuishouBLL.GetModelByKaipiaoId(orderIds);
+ 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/InvoicingCuishou.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingCuishou.aspx.designer.cs
new file mode 100644
index 0000000..d79fc3a
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingCuishou.aspx.designer.cs
@@ -0,0 +1,116 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.business
+{
+
+
+ public partial class InvoicingCuishou
+ {
+
+ /// <summary>
+ /// CMSHead1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
+
+ /// <summary>
+ /// form1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+ /// <summary>
+ /// txtkaipiaoshijian 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl txtkaipiaoshijian;
+
+ /// <summary>
+ /// txtBuyerName 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl txtBuyerName;
+
+ /// <summary>
+ /// txtBusinessManager 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl txtBusinessManager;
+
+ /// <summary>
+ /// txtshuliang 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl txtshuliang;
+
+ /// <summary>
+ /// txtjine 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl txtjine;
+
+ /// <summary>
+ /// txtStartTime 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtStartTime;
+
+ /// <summary>
+ /// btnSubmit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputButton btnSubmit;
+
+ /// <summary>
+ /// ids 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputHidden ids;
+
+ /// <summary>
+ /// rptData 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Repeater rptData;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingHuikuan.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingHuikuan.aspx
new file mode 100644
index 0000000..a780bd8
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingHuikuan.aspx
@@ -0,0 +1,140 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="InvoicingHuikuan.aspx.cs" Inherits="CY.WebForm.Pages.business.InvoicingHuikuan" %>
+
+<!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 colspan='2' class='col_third'>
+ 寮�绁ㄦ椂闂达細
+ <label runat="server" id="txtkaipiaoshijian"></label>
+ </td>
+ </tr>
+ <%-- <tr>
+ <td colspan='2' class='col_third' '>
+ 寮�绁ㄧ敵璇峰崟鍙凤細
+ <label runat="server" id="txtSellerOrderId"></label>
+
+ </td>
+ </tr>--%>
+ <tr>
+ <td colspan='2' class='col_third' '>
+ 瀹㈡埛鍗曚綅锛�
+ <label runat="server" id="txtBuyerName"></label>
+
+ </td>
+ </tr>
+ <tr>
+ <td colspan='2' class='col_third' >
+ 涓氬姟缁忕悊锛�
+ <label runat="server" id="txtBusinessManager"></label>
+
+ </td>
+ </tr>
+ <tr>
+ <td class='col_third' >
+ 璁㈠崟鏁伴噺锛�
+ <label runat="server" id="txtshuliang"></label>
+
+ </td>
+ <td class='col_third' >
+ 閲戦锛�
+ <label runat="server" id="txtjine"></label>
+
+ </td>
+ </tr>
+ <tr >
+ <td class='col_third' colspan='2' >
+ 宸插洖娆鹃噾棰濓細
+ <label runat="server" id="txtYihuikuanjine"></label>
+
+ </td>
+ </tr>
+ <tr >
+ <td class="contentLeft" colspan='2' >鍥炴鏃堕棿锛� <input type="text" id="txtStartTime" runat="server" class="date w150px" datefmt="yyyy-MM-dd" /></td>
+
+ </tr>
+ <tr >
+ <td class="contentLeft" colspan='2' >鍥炴閲戦锛� <input type="text" id="txtHuikuanJIne" runat="server" class="w150px" maxlength='18' onblur="validateAmount(event)" placeholder="璇疯緭鍏ュ鍑忛噾棰�" /></td>
+
+ </tr>
+ <tr>
+ <td class="contentLeft" colspan='2'>
+ 　　　　　<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="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("huikuanTime", "{0:yyyy-MM-dd}")%>
+
+ </td>
+ <td style="text-align: center;">
+ <%#Eval("Huikuanmoney", "{0:F}")%>
+
+
+ </td>
+
+
+
+ </tr>
+ </itemtemplate>
+ </asp:repeater>
+ </tbody>
+ </table>
+ </form>
+</body>
+ <script type="text/javascript" language="javascript">
+ function validateAmount(event) {
+ var input = event.target;
+ var value = input.value;
+ var regex = /^[0-9]+(\.[0-9]{1,2})?$/;
+
+ if (!regex.test(value)) {
+ // 杈撳叆鏃犳晥锛岄噸缃�煎苟灏嗙劍鐐硅鍥炴枃鏈
+ input.value = '0';
+ input.focus();
+ alert('璇疯緭鍏ユ湁鏁堢殑閲戦锛屼緥濡� 123 鎴� 45.67');
+ }
+ }
+ </script>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingHuikuan.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingHuikuan.aspx.cs
new file mode 100644
index 0000000..751375e
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingHuikuan.aspx.cs
@@ -0,0 +1,193 @@
+锘�/**
+* 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 InvoicingHuikuan : 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_KaipiaoshenqingBLL oA_KaipiaoshenqingBLL = null;
+ OA_KaipiaonewhuikuanBLL oA_KaipiaonewhuikuanBLL = null;
+
+ /// <summary>
+ /// 鍒濆鍖栨瀯閫�
+ /// </summary>
+ public InvoicingHuikuan()
+ {
+ bll_OA_CorporateClientsBLL = new OA_CorporateClientsBLL();
+ _StaffBLL = new OA_StaffBLL();
+ _eC_OrderBasicBLL = new EC_OrderBasicBLL();
+ oA_KaipiaoshenqingBLL = new OA_KaipiaoshenqingBLL();
+ oA_KaipiaonewhuikuanBLL = new OA_KaipiaonewhuikuanBLL();
+ }
+ /// <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;
+ }
+ if (this.txtHuikuanJIne.Value.ToDecimal2()<=0)
+ {
+ JavaScript.MessageBox("璇疯緭鍏ュ洖娆鹃噾棰濓紒", this);
+ return;
+ }
+
+ bool isWin = false;
+ OA_Kaipiaoshenqing oA_Kaipiaoshenqing = oA_KaipiaoshenqingBLL.GetModelByKeyid(orderIds.ToGuid2());
+
+ if(oA_Kaipiaoshenqing.kpmoney - (oA_Kaipiaoshenqing.Huikuanmoney.HasValue ? oA_Kaipiaoshenqing.Huikuanmoney.Value : 0) < this.txtHuikuanJIne.Value.ToDecimal2())
+ {
+ JavaScript.MessageBox("鍥炴閲戦澶т簬鍓╀綑鍥炴閲戦锛�", this);
+ return;
+ }
+
+
+ //oA_Kaipiaoshenqing.Kaipiaoshenqing = 3;
+ //oA_Kaipiaoshenqing.KaipiaoquerenCreater = CurrentUser.TrueMemberId;
+ //oA_Kaipiaoshenqing.KaipiaoquerenTime = DateTime.Now;
+ //oA_Kaipiaoshenqing.Fapiaohao = this.txtFapiaohao.Value.Trim();
+
+
+ oA_Kaipiaoshenqing.Huikuanmoney = (oA_Kaipiaoshenqing.Huikuanmoney.HasValue ? oA_Kaipiaoshenqing.Huikuanmoney.Value : 0) + this.txtHuikuanJIne.Value.ToDecimal2();
+
+ isWin = oA_KaipiaoshenqingBLL.UpdateModel(oA_Kaipiaoshenqing);
+
+
+
+
+
+ var oA_Kaipiaonewhuikuan = new OA_Kaipiaonewhuikuan();
+ oA_Kaipiaonewhuikuan.KaipiaoId = oA_Kaipiaoshenqing.Keyid;
+ oA_Kaipiaonewhuikuan.Creater = CurrentUser.ShortName;
+ oA_Kaipiaonewhuikuan.CreateTime = DateTime.Now;
+ oA_Kaipiaonewhuikuan.huikuanTime = this.txtStartTime.Value.ToDateTime2();
+ oA_Kaipiaonewhuikuan.Huikuanmoney = this.txtHuikuanJIne.Value.ToDecimal2();
+ isWin = oA_KaipiaonewhuikuanBLL.InsertModel(oA_Kaipiaonewhuikuan);
+
+ 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_Kaipiaoshenqing oA_Kaipiaoshenqing = oA_KaipiaoshenqingBLL.GetModelByKeyid(orderIds.ToGuid2());
+ OA_CorporateClients m_OA_CorporateClients = bll_OA_CorporateClientsBLL.SelectModelByFirmIdandMemberId(CurrentUser.MemberId, oA_Kaipiaoshenqing.BuyerId);
+
+ this.txtBuyerName.InnerText = m_OA_CorporateClients.CompanyName;
+ OA_Staff oA_Staff = _StaffBLL.GetModelByKeyid(oA_Kaipiaoshenqing.BusinessManagerId);
+ if (oA_Staff != null)
+ {
+ this.txtBusinessManager.InnerText = oA_Staff.Name;
+ }
+ this.txtkaipiaoshijian.InnerText = oA_Kaipiaoshenqing.KaipiaoquerenTime.HasValue? oA_Kaipiaoshenqing.KaipiaoquerenTime.Value.ToString("yyyy-MM-dd"):"";
+ //this.txtSellerOrderId.InnerText = oA_Kaipiaoshenqing.SellerOrderId;
+ this.txtshuliang.InnerText = oA_Kaipiaoshenqing.Dingdanshu.ToString();
+
+ this.txtStartTime.Value = DateTime.Now.ToString("yyyy-MM-dd");
+
+
+
+ this.txtYihuikuanjine.InnerText = String.Format("{0:F}", oA_Kaipiaoshenqing.Huikuanmoney);
+
+
+ this.txtjine.InnerText = String.Format("{0:F}", oA_Kaipiaoshenqing.kpmoney);
+ this.txtHuikuanJIne.Value = String.Format("{0:F}", (oA_Kaipiaoshenqing.kpmoney - (oA_Kaipiaoshenqing.Huikuanmoney.HasValue? oA_Kaipiaoshenqing.Huikuanmoney.Value:0))); ;
+ var result = oA_KaipiaonewhuikuanBLL.GetModelByKaipiaoId(orderIds);
+ 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/InvoicingHuikuan.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingHuikuan.aspx.designer.cs
new file mode 100644
index 0000000..5fd9ade
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingHuikuan.aspx.designer.cs
@@ -0,0 +1,134 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.business
+{
+
+
+ public partial class InvoicingHuikuan
+ {
+
+ /// <summary>
+ /// CMSHead1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
+
+ /// <summary>
+ /// form1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+ /// <summary>
+ /// txtkaipiaoshijian 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl txtkaipiaoshijian;
+
+ /// <summary>
+ /// txtBuyerName 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl txtBuyerName;
+
+ /// <summary>
+ /// txtBusinessManager 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl txtBusinessManager;
+
+ /// <summary>
+ /// txtshuliang 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl txtshuliang;
+
+ /// <summary>
+ /// txtjine 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl txtjine;
+
+ /// <summary>
+ /// txtYihuikuanjine 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl txtYihuikuanjine;
+
+ /// <summary>
+ /// txtStartTime 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtStartTime;
+
+ /// <summary>
+ /// txtHuikuanJIne 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtHuikuanJIne;
+
+ /// <summary>
+ /// btnSubmit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputButton btnSubmit;
+
+ /// <summary>
+ /// ids 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputHidden ids;
+
+ /// <summary>
+ /// rptData 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Repeater rptData;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingOrderPrint.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingOrderPrint.aspx.cs
index b82e9c4..3029430 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingOrderPrint.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingOrderPrint.aspx.cs
@@ -109,7 +109,7 @@
SetParamValue(searchParam, 14, "");
SetParamValue(searchParam, 15, "");
SetParamValue(searchParam, 16, "");
- SetParamValue(searchParam, 18, (CurrentUser.StaffId > 0 ? 1 : 0));
+ SetParamValue(searchParam, 18, 0);
SetParamValue(searchParam, 19, CurrentUser.TrueMemberId);
SetParamValue(searchParam, 20, CurrentUser.StaffId);
SetParamValue(searchParam, 21, CurrentUser.TrueName);
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
index d7ba57b..ebf30a7 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
@@ -262,7 +262,7 @@
璁㈠崟鎬讳环锛�
</td>
<td align="left">
- <input id='txtSumPrice' runat="server" maxlength='9' value='0' class="req float" min="0" onchange="jsdjPrice(this.value)" />
+ <input id='txtSumPrice' runat="server" maxlength='16' value='0' class="req float" min="0" onchange="jsdjPrice(this.value)" />
</td>
<td align="right" id="selVerifyWay12">
鏍＄鏂瑰紡锛�
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderKehuqianshou.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderKehuqianshou.aspx
index 2edfe34..d57fde5 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderKehuqianshou.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderKehuqianshou.aspx
@@ -1,46 +1,97 @@
-锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="OrderKehuqianshou.aspx.cs" Inherits="CY.WebForm.Pages.business.OrderKehuqianshou" %>
-
-<!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" />
- <script src="../../js/business/Custom.js" type="text/javascript"></script>
- <script type="text/javascript">
-
-
-
- </script>
-</head>
-<body>
- <form runat="server" id="form1" class="form2">
- <fieldset>
- <legend>鍩烘湰淇℃伅</legend>
- <table class="tableStyle" width="100%">
- <tr>
- <td class="ali03 ">璁㈠崟鍙凤細</td>
<td ><label id="labSellerOrderId" runat="server"></label></td>
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="OrderKehuqianshou.aspx.cs" Inherits="CY.WebForm.Pages.business.OrderKehuqianshou" %>
+<!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" />
+ <script src="../../js/business/Custom.js" type="text/javascript"></script>
+ <script type="text/javascript">
+
+
+
+ </script>
+</head>
+<body>
+ <form runat="server" id="form1" class="form2">
+ <fieldset>
+ <legend>鍩烘湰淇℃伅</legend>
+ <table class="table2" width="100%">
+
+
+ <tr>
+ <td colspan='2' class='col_third'>
+ 寮�绁ㄦ椂闂达細
+ <label runat="server" id="txtkaipiaoshijian"></label>
+ </td>
+ </tr>
+ <%--<tr>
+ <td colspan='2' class='col_third' '>
+ 寮�绁ㄧ敵璇峰崟鍙凤細
+ <label runat="server" id="txtSellerOrderId"></label>
+
+ </td>
+ </tr>--%>
+ <tr>
+ <td colspan='2' class='col_third' '>
+ 瀹㈡埛鍗曚綅锛�
+ <label runat="server" id="txtBuyerName"></label>
+
+ </td>
+ </tr>
+ <tr>
+ <td colspan='2' class='col_third' >
+ 涓氬姟缁忕悊锛�
+ <label runat="server" id="txtBusinessManager"></label>
+
+ </td>
+ </tr>
+ <tr>
+ <td class='col_third' >
+ 璁㈠崟鏁伴噺锛�
+ <label runat="server" id="txtshuliang"></label>
+
+ </td>
+ <td class='col_third' >
+ 寮�绁ㄩ噾棰濓細
+ <label runat="server" id="txtjine"></label>
+
+ </td>
+ </tr>
+ <tr >
+ <td class="contentLeft" colspan='2' > 鍙戠エ鍙风爜锛�<label runat="server" id="txtFapiaohao"></label> </td>
+
</tr>
- <tr>
-
-
- <td class="ali02" colspan="2">
-
- <asp:Button ID="btn_Submit" Text="淇濆瓨" runat="server" OnClick="btn_Submit_Config" />
-
- <input type="hidden" id="HideKeyid" runat="server" /></td>
-
- </tr>
- </table>
- </fieldset>
-
-
- </form>
-</body>
-<script type="text/javascript">
-
-</script>
-</html>
+ <tr>
+
+
+
+ <td class="contentLeft" colspan='2' >
+ 涓婁紶鍥炴墽: <input type="file" id="filesel" name="__hetongFile" keepdefaultstyle="true" runat="server" text="璇烽�夋嫨鏂囦欢" />
+
+ </td>
+
+ </tr>
+ <tr>
+ <td class="contentLeft" colspan='2'>
+ 　　　　　 <asp:Button ID="btn_Submit" Text="纭绛炬敹" runat="server" OnClick="btn_Submit_Config" />
+ <input type="hidden" id="ids" runat="server" />
+ </td>
+ </tr>
+ </table>
+
+
+
+
+
+
+ </fieldset>
+
+
+ </form>
+</body>
+<script type="text/javascript">
+
+</script>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderKehuqianshou.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderKehuqianshou.aspx.cs
index 207cc6c..ba678ba 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderKehuqianshou.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderKehuqianshou.aspx.cs
@@ -12,21 +12,30 @@
using System.Text;
using CY.BLL.OA;
using CY.BLL.EC;
-
+using System.Collections;
+using System.Globalization;
+using System.IO;
+using CY.Infrastructure.Configuration;
namespace CY.WebForm.Pages.business
{
public partial class OrderKehuqianshou : BasePage
{
- EC_OrderBasicBLL eC_OrderBasicBLL = null;
- EC_OrderBLL eC_OrderBLL = null;
- OA_KaipiaoshenqingBLL OA_KaipiaoshenqingBLL = null;
+ 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_KaipiaoshenqingBLL oA_KaipiaoshenqingBLL = null;
public OrderKehuqianshou()
{
- eC_OrderBasicBLL = new EC_OrderBasicBLL();
- eC_OrderBLL = new EC_OrderBLL();
- OA_KaipiaoshenqingBLL = new OA_KaipiaoshenqingBLL();
+ bll_OA_CorporateClientsBLL = new OA_CorporateClientsBLL();
+ _StaffBLL = new OA_StaffBLL();
+ _eC_OrderBasicBLL = new EC_OrderBasicBLL();
+ oA_KaipiaoshenqingBLL = new OA_KaipiaoshenqingBLL();
}
protected void Page_Load(object sender, EventArgs e)
{
@@ -34,8 +43,41 @@
{
if (!IsPostBack)
{
- this.HideKeyid.Value = Request["Keyid"].ToString2();
- this.labSellerOrderId.InnerText = Request["SellerOrderId"].ToString2();
+ try
+ {
+ string orderIds = Request["id"];
+ if (string.IsNullOrEmpty(orderIds))
+ {
+ JavaScript.MessageBox("璁㈠崟涓嶅瓨鍦紒", this);
+ return;
+ }
+
+ this.ids.Value = orderIds;
+ OA_Kaipiaoshenqing oA_Kaipiaoshenqing = oA_KaipiaoshenqingBLL.GetModelByKeyid(orderIds.ToGuid2());
+ OA_CorporateClients m_OA_CorporateClients = bll_OA_CorporateClientsBLL.SelectModelByFirmIdandMemberId(CurrentUser.MemberId, oA_Kaipiaoshenqing.BuyerId);
+
+ this.txtBuyerName.InnerText = m_OA_CorporateClients.CompanyName;
+ OA_Staff oA_Staff = _StaffBLL.GetModelByKeyid(oA_Kaipiaoshenqing.BusinessManagerId);
+ if (oA_Staff != null)
+ {
+ this.txtBusinessManager.InnerText = oA_Staff.Name;
+ }
+ this.txtkaipiaoshijian.InnerText = oA_Kaipiaoshenqing.KaipiaoquerenTime.HasValue? oA_Kaipiaoshenqing.KaipiaoquerenTime.Value.ToString("yyyy-MM-dd"):"";
+ //this.txtSellerOrderId.InnerText = oA_Kaipiaoshenqing.SellerOrderId;
+ this.txtshuliang.InnerText = oA_Kaipiaoshenqing.Dingdanshu.ToString();
+
+ this.txtFapiaohao.InnerText = oA_Kaipiaoshenqing.Fapiaohao.ToString();
+
+
+ this.txtjine.InnerText = String.Format("{0:F}", oA_Kaipiaoshenqing.kpmoney + oA_Kaipiaoshenqing.Zengjianmoney);
+
+
+ }
+ catch (Exception ex)
+ {
+ PAGEHandleException(ex);
+ JavaScript.MessageBox("璁㈠崟涓嶅瓨鍦紒", this);
+ }
}
@@ -57,29 +99,92 @@
try
{
- //string sss = Request["txtDelayTime"];
- // this.txtDelayTime.Value;
- if (this.HideKeyid.Value == "")
+ var files = Request.Files;
+ if (files.Count <= 0)
{
- JavaScript.MessageBox("娌℃湁璁㈠崟id", this);
+ JavaScript.MessageBox("璇烽�夋嫨鏂囦欢锛�", this);
+ return;
}
-
- Guid Keyid = this.HideKeyid.Value.ToGuid2();
+
+
+ HttpPostedFile file = null;
+
+
+
+ for (int i = 0; i < files.Count; i++)
+ {
+
+ if (files.Keys[i] == "filesel")
+ {
+ file = files[i];
+ if (file.ContentLength == 0)
+ {
+ JavaScript.MessageBox("璇烽�夋嫨鏂囦欢锛�", this);
+ return;
+ }
+
+ break;
+ }
+
+ }
+
+
+ string WebDomain = ConfigurationSetting.TuPianLuJing;
+ //鏍圭洰褰曡矾寰勶紝鐩稿璺緞
+ String savePath = "/images/WorkBook/" + DateTime.Now.ToString("yyyyMMdd") + "/";
+ //鏍圭洰褰昒RL锛屽彲浠ユ寚瀹氱粷瀵硅矾寰勶紝姣斿 http://www.yoursite.com/attached/
+ String saveUrl = ConfigurationSetting.TuPianLuJing.TrimEnd('/') + "/images/WorkBook/" + DateTime.Now.ToString("yyyyMMdd") + "/";
+
+ string fileTypes = "gif,jpg,jpeg,png,bmp";
+ double maxSize = 2 * 1024 * 1024;
+
+
+ string dirPath = Server.MapPath("~" + savePath);
+ if (!Directory.Exists(dirPath))
+ {
+ Directory.CreateDirectory(dirPath);
+ }
+
+ string fileName = file.FileName;
+ string fileExt = Path.GetExtension(fileName).ToLower();
+
+ ArrayList fileTypeList = ArrayList.Adapter(fileTypes.Split(','));
+
+
+ if (file.InputStream == null || file.InputStream.Length > maxSize)
+ {
+ JavaScript.MessageBox("涓婁紶鏂囦欢澶у皬瓒呰繃闄愬埗", this);
+
+ }
+
+ if (string.IsNullOrEmpty(fileExt) || Array.IndexOf(fileTypes.Split(','), fileExt.Substring(1).ToLower()) == -1)
+ {
+ JavaScript.MessageBox("涓婁紶鏂囦欢鎵╁睍鍚嶆槸涓嶅厑璁哥殑鎵╁睍鍚�", this);
+
+ }
+
+ string newFileName = DateTime.Now.ToString("yyyyMMddHHmmss_ffff", DateTimeFormatInfo.InvariantInfo) + fileExt;
+ string filePath = dirPath + newFileName;
+ file.SaveAs(filePath);
+ string fileUrl = savePath + newFileName;
+
+
+ Guid Keyid = Request["ids"].ToGuid2();
DateTime Kehuqianshou = DateTime.Now;
- OA_Kaipiaoshenqing oA_Kaipiaoshenqing = OA_KaipiaoshenqingBLL.GetModelByKeyid(Keyid);
+ OA_Kaipiaoshenqing oA_Kaipiaoshenqing = oA_KaipiaoshenqingBLL.GetModelByKeyid(Keyid);
oA_Kaipiaoshenqing.KehuqianshouCreater = CurrentUser.TrueMemberId;
oA_Kaipiaoshenqing.KehuqianshouTime = Kehuqianshou;
oA_Kaipiaoshenqing.Kehuqianshou = 2;
+ oA_Kaipiaoshenqing.Kehuqianshoutupian = fileUrl;
-
- bool result = OA_KaipiaoshenqingBLL.UpdateModel(oA_Kaipiaoshenqing);
+ bool result = oA_KaipiaoshenqingBLL.UpdateModel(oA_Kaipiaoshenqing);
if (result)
JavaScript.MessageBox("鏇存柊鎴愬姛", this, true, true);
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderKehuqianshou.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderKehuqianshou.aspx.designer.cs
index 4628081..6ca3816 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderKehuqianshou.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderKehuqianshou.aspx.designer.cs
@@ -33,13 +33,67 @@
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
- /// labSellerOrderId 鎺т欢銆�
+ /// txtkaipiaoshijian 鎺т欢銆�
/// </summary>
/// <remarks>
/// 鑷姩鐢熸垚鐨勫瓧娈点��
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
- protected global::System.Web.UI.HtmlControls.HtmlGenericControl labSellerOrderId;
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl txtkaipiaoshijian;
+
+ /// <summary>
+ /// txtBuyerName 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl txtBuyerName;
+
+ /// <summary>
+ /// txtBusinessManager 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl txtBusinessManager;
+
+ /// <summary>
+ /// txtshuliang 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl txtshuliang;
+
+ /// <summary>
+ /// txtjine 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl txtjine;
+
+ /// <summary>
+ /// txtFapiaohao 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl txtFapiaohao;
+
+ /// <summary>
+ /// filesel 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputFile filesel;
/// <summary>
/// btn_Submit 鎺т欢銆�
@@ -51,12 +105,12 @@
protected global::System.Web.UI.WebControls.Button btn_Submit;
/// <summary>
- /// HideKeyid 鎺т欢銆�
+ /// ids 鎺т欢銆�
/// </summary>
/// <remarks>
/// 鑷姩鐢熸垚鐨勫瓧娈点��
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
- protected global::System.Web.UI.HtmlControls.HtmlInputHidden HideKeyid;
+ protected global::System.Web.UI.HtmlControls.HtmlInputHidden ids;
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx
new file mode 100644
index 0000000..30d286e
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx
@@ -0,0 +1,797 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="OrderListBatchKaipiao.aspx.cs" Inherits="CY.WebForm.Pages.business.OrderListBatchKaipiao" %>
+
+<!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?v=5" type="text/javascript"></script>
+ <script type="text/javascript">
+
+ function kaipiaoConfirm(orderId) {
+ var url = "/Pages/business/kaipiaoConfirm.aspx?id=" + orderId;
+ top.Dialog.open({ URL: url, Title: "寮�绁ㄧ敵璇风‘璁�", Height: 600, Width: 580 });
+ }
+
+ //璁㈠崟璇勪环
+ function evaluationModel(orderid) {
+ dialog.open({ URL: "/Pages/business/EvaluationSeller.aspx?orderid=" + orderid, Title: "鍗栧璇勪环", Width: 580, Height: 300 });
+ }
+
+ function OpenComplainan(orderId, orderCode, firmId) {
+ var url = "/Pages/business/ComplainanEdit.aspx?orderId=" + orderId;
+ url += "&orderCode=" + orderCode;
+ url += "&firmId=" + firmId;
+ url += "&type=1";
+ top.Dialog.open({ URL: url, Title: "鏂板鎶曡瘔" });
+ }
+
+ function OpenVisit(orderId, orderCode, buyerName) {
+ var url = "/Pages/business/BackVisitNoteEdit.aspx?id=" + orderId;
+ url += "&orderId=" + orderCode;
+ url += "&buyerName=" + buyerName;
+ top.Dialog.open({ URL: url, Title: "璁㈠崟鍥炶", Height: 400 });
+ }
+
+ function CompledWork(orderId) {
+ var url = "/Pages/business/CompledWork.aspx?ids=" + orderId;
+ top.Dialog.open({ URL: url, Title: "瀹屽伐", Height: 300, Width: 680 });
+ }
+
+ function DeliverWork(orderId, orderCode, orderState) {
+ var url = "/Pages/business/DeliverWork.aspx?id=" + orderId;
+ url += "&OrderShowId=" + orderCode;
+ url += "&OrderState=" + orderState;
+ top.Dialog.open({ URL: url, Title: "閫佽揣", Height: 450, Width: 680 });
+ }
+
+ //鏌ョ湅瀹㈡埛璧勬枡
+ function View(personId) {
+ top.Dialog.open({ URL: "/Pages/business/CorporateClientsDetail.aspx?Keyid=" + personId, Title: "鏌ョ湅瀹㈡埛", Width: 900, Height: 580 });
+ }
+
+ //涓嬭浇鏂囦欢
+ function onDownLoad(keyid) {
+ top.Dialog.confirm("纭畾瑕佷笅杞芥枃浠讹紵", function () {
+ window.location = "/Pages/business/OrderList.aspx?downId=" + keyid;
+ });
+ }
+
+ $(function () {
+ $(".td_hide").find("span").hide();
+ $(".td_hide").find("span").each(
+ function () {
+ var value = $.trim($(this).text());
+ var classValue = $(this).attr("class");
+ if (value == '鈭�') {
+ $(this).show();
+ }
+ if (classValue == "hand_yes") {
+ $(this).show();
+ }
+ if (classValue == "hand_no") {
+ $(this).removeAttr("onclick");
+ }
+ }
+ );
+
+ $(".td_hide").hover(function () {
+ $(this).find("span").each(
+ function () {
+ var value = $.trim($(this).text());
+ var classValue = $(this).attr("class");
+ if (value == '鈭�') {
+
+ }
+ else {
+ if (classValue == "hand_no") {
+ }
+ else {
+ $(this).show();
+ }
+ }
+ }
+ );
+ }, function () {
+ $(this).find("span").each(
+ function () {
+ var value = $.trim($(this).text());
+ var classValue = $(this).attr("class");
+ if (value == '鈭�') {
+ }
+ else {
+ if (classValue == "hand_yes") {
+ $(this).show();
+ }
+ else {
+ $(this).hide();
+ }
+ }
+ }
+ );
+ });
+
+ $(".edit").each(
+ function () {
+ var hideOrderState = $(this).next().val();
+ var hideOrderType = $(this).next().next().val();
+ var orderState = parseInt(hideOrderState);
+ var orderType = parseInt(hideOrderType);
+ if (orderState >= 4 || orderState <= 0 || orderType > 1) {
+ $(this).removeClass("a_under");
+ $(this).removeAttr("onclick");
+ }
+ }
+ );
+ });
+
+ $(function () {
+ var value_SumPrice = 0;
+ $(".SumPrice").each(function (ii, vv) {
+ value_SumPrice += parseFloat($(vv).text());
+ });
+ $("#AllMoney").html(value_SumPrice.toFixed(2));
+
+ var value_PayedMoney = 0;
+ $(".PayedMoney").each(function (ii, vv) {
+ value_PayedMoney += parseFloat($(vv).text());
+ });
+ $("#AlreadyMoney").html(value_PayedMoney.toFixed(2));
+
+ var value_UnPayedMoney = 0;
+ $(".UnPayedMoney").each(function (ii, vv) {
+ value_UnPayedMoney += parseFloat($(vv).text());
+ });
+ $("#NoMoney").html(value_UnPayedMoney.toFixed(2));
+ });
+
+ </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;
+ }
+
+
+ .StatisticsMoney td { color: #FF5500; }
+ .StatisticsMoney span { color: #FF5500; font-weight: bold; }
+
+ </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="txtBeginData" type="text" runat="server" class='date w80px' maxlength='10' />-<input id="txtEndDate" type="text" runat="server" class='date w80px' maxlength='10' />
+ </td>
+ <td class="ali03">
+ 璁㈠崟缂栧彿锛�
+ </td>
+ <td>
+ <input id='txtOrderId' runat="server" maxlength='25' />
+ </td>
+ <td class="ali03">
+ 璁㈠崟绫诲瀷锛�
+ </td>
+ <td>
+ <select keepdefaultstyle='true' class=' firstfocus' id='selPrintTypes' runat="server" datatextfield="PrintName" datavaluefield="Keyid">
+ </select>
+ </td>
+ <%--<td class="ali03">
+ 璁㈠崟鏉ユ簮锛�
+ </td>
+ <td>
+ <select keepdefaultstyle='true' id='selOrderTypes' runat="server" datatextfield="Name" datavaluefield="MeanValue">
+ </select>
+ </td>--%>
+ <td class="ali03">
+ 鍒跺崟浜猴細
+ </td>
+ <td>
+ <input id='txtCreaterName' runat="server" maxlength='50' />
+ </td>
+ </tr>
+ <tr style="padding-left: 50px">
+ <%--<td class="ali03">
+ 瀹㈡埛绾у埆锛�
+ </td>
+ <td>
+ <select keepdefaultstyle='true' id='selCustormerLevels' runat="server" datatextfield='Name' datavaluefield='Keyid'>
+ </select>
+ </td>--%>
+ <td class="ali03">
+ 瀹㈡埛鍚嶇О锛�
+ </td>
+ <td>
+ <input id='txtCustormerName' runat="server" maxlength='50' />
+ </td>
+ <td class="ali03">
+ 瀹㈡埛缁忕悊锛�
+ </td>
+ <td>
+ <select keepdefaultstyle='true' id='selCustormerManager' runat="server" datatextfield='Name' datavaluefield='Keyid'>
+ </select>
+ </td>
+ <td class="ali03">
+ 涓氬姟缁忕悊锛�
+ </td>
+ <td>
+ <select keepdefaultstyle='true' id='selBusinessManager' runat="server" datatextfield='Name' datavaluefield='Keyid'>
+ </select>
+ </td>
+ <%--<td class="ali03">
+ 璁㈠崟鐘舵�侊細
+ </td>
+ <td>
+ <select keepdefaultstyle='true' id='selOrderStates' runat="server" datatextfield="Name" datavaluefield="MeanValue">
+ </select>
+ </td>--%>
+ <td class="ali03">
+
+ </td>
+ <td>
+ <asp:button id="btn_Search" text="鏌ヨ" runat="server" /> <input type="button" value='閲嶇疆' onclick='document.body.innerHTML="";window.location=window.location;' />
+ <input type="hidden" id='txtCommission' runat="server" />
+ </td>
+
+ </tr>
+ <%-- <tr>
+ <td class="ali03">
+ 鏀舵鐘舵�侊細
+ </td>
+ <td>
+ <select keepdefaultstyle='true' id='selPayStates' runat="server" datatextfield="Name" datavaluefield="MeanValue">
+ </select>
+ </td>--%>
+ <%--<td class="ali03">
+ 浠樻鏂瑰紡锛�
+ </td>
+ <td>
+ <asp:dropdownlist keepdefaultstyle='true' id="selPayType" runat="server">
+ </asp:dropdownlist>
+ </td>--%>
+ <%-- <td class="ali03">
+ 鍥炶鎯呭喌锛�
+ </td>
+ <td>
+ <asp:dropdownlist keepdefaultstyle='true' id="selReturnvisit" runat="server">
+ <asp:listitem value="">鍏ㄩ儴</asp:listitem>
+ <asp:listitem value="宸插洖璁�">宸插洖璁�</asp:listitem>
+ <asp:listitem value="鏈洖璁�">鏈洖璁�</asp:listitem>
+ </asp:dropdownlist>
+ </td>
+ <td class="ali03">
+ 璇勪环鎯呭喌锛�
+ </td>
+ <td>
+ <asp:dropdownlist keepdefaultstyle='true' id="selAppraise" runat="server">
+ <asp:listitem value="">鍏ㄩ儴</asp:listitem>
+ <asp:listitem value="鏈瘎浠�">鏈瘎浠�</asp:listitem>
+ <asp:listitem value="1">濂借瘎</asp:listitem>
+ <asp:listitem value="0">涓瘎</asp:listitem>
+ <asp:listitem value="-1">宸瘎</asp:listitem>
+ </asp:dropdownlist>
+ </td>
+ <td>
+ </td>
+ <td>
+
+ </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="window.location='OrderEdit.aspx';" menu_member_case_id="case_addOrder" menu_member_case_name="鏂板璁㈠崟" class='newadd' id='link_new'><span class="icon_add">鏂板璁㈠崟</span></a>
+ <div class="box_tool_line">
+ </div>
+ <a href="javascript:;" class='delete' menu_member_case_id="case_deleteOrderList" menu_member_case_name="鎵归噺鍒犻櫎" onclick="ToBatch(BatchDelete,IsObjCanntDelete);"><span class="icon_delete">鎵归噺鍒犻櫎</span></a>
+ <div class="box_tool_line">
+ </div>--%>
+
+ <a href="javascript:;" menu_member_case_id="case_ToBatchRemoveList" menu_member_case_name="鍘婚櫎璁㈠崟" onclick="ToBatchRemove();"><span class="icon_remove">鍘婚櫎璁㈠崟</span></a>
+ <div class="box_tool_line">
+ </div>
+ <a href="javascript:;" menu_member_case_id="case_ToBatchInvoicingList" menu_member_case_name="寮�绁ㄧ敵璇�" onclick="ToBatchInvoicingList();"><span class="icon_edit">寮�绁ㄧ敵璇�</span></a>
+ <div class="box_tool_line">
+ </div>
+ <%-- <a href="javascript:;" menu_member_case_id="case_ToBatchPayList" menu_member_case_name="鎵归噺鏀舵" onclick="ToBatchPayList();"><span class="icon_edit">鎵归噺鏀舵</span></a>
+ <div class="box_tool_line">
+ </div>
+ <a href="javascript:;" menu_member_case_id="case_ToBatchPrintAwbOrder" menu_member_case_name="鎵撳嵃閫佽揣鍗�" onclick="ToPrintAwbOrder()"><span class="icon_edit">鎵撳嵃閫佽揣鍗�</span></a>--%>
+ <div class="clear">
+ </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 width="25">
+ 缂栧彿
+ </th>
+ <th style="text-align: center;" width="70">
+ 璁㈠崟鍙�
+ </th>
+ <th style="text-align: center;">
+ 瀹㈡埛鍚嶇О
+ </th>
+ <th width="55">
+ 璁㈠崟鏉ユ簮
+ </th>
+ <th class="auto-style4">
+ 璁㈠崟绫诲埆
+ </th>
+ <th style="text-align: center;">
+ 鍗颁欢鍚嶇О
+ </th>
+ <th width="36">
+ 鏁伴噺
+ </th>
+
+ <th style="text-align: center;" width="50">
+ 璁㈠崟鐘舵��
+ </th>
+ <th style="text-align: center;" width="50">
+ 鏀舵鐘舵��
+ </th>
+ <th style="text-align: center;" width="50">
+ 浠樻鏂瑰紡
+ </th>
+ <th width="60">
+ 寮�绁ㄧ敵璇�
+ </th>
+ <th width="60">
+ 閲戦
+ </th>
+ <th width="60">
+ 宸叉敹娆�
+ </th>
+ <th width="60">
+ 鏈粯娆�
+ </th>
+
+ <%-- <th width="26" menu_member_case_id="case_PrintOrder" menu_member_case_name="鎵撳嵃">
+ 鎵撳嵃
+ </th>
+ <th menu_member_case_id="case_ToAccept" menu_member_case_name="鍙楃悊" class="auto-style5">
+ 鍙楃悊
+ </th>
+ <th width="26" menu_member_case_id="case_CompledWork" menu_member_case_name="瀹屽伐">
+ 瀹屽伐
+ </th>
+ <th width="26" menu_member_case_id="case_DeliverWork" menu_member_case_name="閫佽揣">
+ 閫佽揣
+ </th>
+ <th width="26" menu_member_case_id="case_ShowDoDelay" menu_member_case_name="鎾ゅ崟">
+ 鎾ゅ崟
+ </th>
+ <th width="26" menu_member_case_id="case_DeferPay" menu_member_case_name="寤舵湡">
+ 寤舵湡
+ </th>
+ <th width="26" menu_member_case_id="case_OpenVisit" menu_member_case_name="鍥炶">
+ 鍥炶
+ </th>
+ <th menu_member_case_id="case_evaluationModel" menu_member_case_name="璇勪环" class="auto-style1">
+ 璇勪环
+ </th>
+ <th width="26" menu_member_case_id="case_OpenComplainan" menu_member_case_name="鎶曡瘔" class="auto-style3">
+ 鎶曡瘔
+ </th>
+ <th width="50" menu_member_case_id="case_onDownLoad" menu_member_case_name="涓嬭浇鏂囦欢">
+ 涓嬭浇鏂囦欢
+ </th>--%>
+ </tr>
+ </thead>
+ <tbody>
+ <asp:repeater id="rptData" runat="server">
+ <itemtemplate>
+ <tr>
+ <td>
+ <input type="checkbox" name='ckId' value_keyid="<%#Eval("Keyid")%>" value="{
+ id:<%#Eval("Keyid")%>,
+ buyerId:'<%#Eval("BuyerId")%>',
+ orderId:'<%#Eval("SellerOrderId")%>',
+ orderType:<%#Eval("OrderTypeId")%>,
+ orderState:<%#Eval("OrderState")%>,
+ ordershowId:'<%#Eval("SellerOrderId")%>',
+ pdName:'<%# (Eval("DocumentName") ?? "").ToString().Replace("\"", "") %>',
+ printName:'<%#Eval("PrintType.PrintName")%>',
+ printNum:<%#Eval("OrderExtend.PrintNum")%>,
+ deliverPrice:<%#Eval("SumPrice")%>,
+ sumPrice:<%#Eval("SumPrice")%>,
+ UnitPrice:'<%#Eval("UnitPrice") %>',
+ Kaipiaoshenqing:'<%#Eval("Kaipiaoshenqing")%>',
+ PayState:<%#Eval("PayState")%>,
+ yssldw: '<%#Eval("OrderExtend.PrintNum")%><%#Eval("yssldw")%>',
+ PrintSizeName:'<%#Eval("PrintSizeName")%>'
+ }" id='ckBox<%#Container.ItemIndex%>' id='ckBox<%#Container.ItemIndex%>' class='ckBox' />
+ </td>
+ <td class="ItemIndex">
+ <%#Container.ItemIndex +1 /*(UCPager1.PageSize *( UCPager1.PageIndex-1)+1)*/%>
+ </td>
+ <td style="text-align: center;">
+ <span class="edit a_under" <%#(int.Parse(Eval("OrderState").ToString())>=4||int.Parse(Eval("OrderState").ToString())<=0||int.Parse(Eval("OrderTypeId").ToString())>1)?"title=''":"title='鐐瑰嚮淇敼璁㈠崟'" %> onclick="window.location='OrderEdit.aspx?Target=ToUpSetData&orderId=<%#Eval("Keyid") %>';">
+ <%#Eval("SellerOrderId")%></span><input type="hidden" id="hideOrderState" runat="server" value='<%#Eval("OrderState")%>' /><input type="hidden" id="hidOrderType" runat="server" value='<%#Eval("OrderTypeId")%>' />
+ <%--<a href='javascript:void(0)' class='a_under' title='鐐瑰嚮鏌ョ湅璁㈠崟璇︽儏' style="display: <%#1.Equals(Eval("OrderState"))?"none;":""%>" onclick='ShowOrder(<%#Eval("Keyid") %>)'>
+ <%#Eval("SellerOrderId")%></a>--%>
+ </td>
+ <td style="text-align: center;">
+ <div style="width: 140px; word-wrap: break-word; text-align:justify;">
+ <a href='javascript:void(0)' title='鐐瑰嚮鏌ョ湅 <%#Eval("BuyerName").ToString()%> 璧勬枡' class='a_under' onclick='View("<%#Eval("BuyerId")%>")'><%#Eval("BuyerName").ToString().Length > 10 ? (Eval("BuyerName").ToString().Substring(0, 10) + "..") : Eval("BuyerName").ToString()%></a>
+ </div>
+ </td>
+ <td>
+ <%#Eval("OrderType.Name")%>
+ </td>
+ <td style="text-align: center;">
+ <%#Eval("PrintType.PrintName")%>
+ </td>
+ <td style="text-align: center; color:<%#(Eval("OrderExtend.ExigencyCaseId").ToString()=="-1" && int.Parse(Eval("OrderState").ToString()) <5 && int.Parse(Eval("OrderState").ToString()) > 0)?"red":""%>;">
+ <span title="<%#Eval("DocumentName")%>"><%#Eval("DocumentName").ToString().Length >15? (Eval("DocumentName").ToString().Substring(0,15)+".."):Eval("DocumentName").ToString() %></span>
+ </td>
+ <td>
+ <%#Eval("OrderExtend.PrintNum")%>
+ </td>
+ <td>
+ <%#Eval("OrderStateObj.Name")%>
+ </td>
+ <td>
+ <%#Eval("PayStateObj.Name")%>
+ </td>
+ <td>
+ <%#Eval("PayType")%>
+ </td>
+ <td>
+ <%#Eval("KaipiaoshenqingName").ToString()==""?"鏈敵璇�":Eval("KaipiaoshenqingName").ToString()%>
+
+ </td>
+ <td class="SumPrice">
+ <%#Eval("SumPrice", "{0:F}")%>
+ </td>
+
+ <td class="PayedMoney">
+ <%#Eval("TradingSingle.PayedMoney", "{0:F}")%>
+ </td>
+ <td class="UnPayedMoney">
+ <%#Eval("UnPayedMoney","{0:F}")%>
+ </td>
+
+ <%-- <td class="td_hide" menu_member_case_id="case_PrintOrder" menu_member_case_name="鎵撳嵃">
+
+ <span class="hand_yes" <%#true.Equals(Eval("IsPrint"))? "title='宸叉墦鍗�'" : "title='鎵撳嵃'"%> onclick='ShowOrder(<%#Eval("Keyid") %>)'>
+ <%#true.Equals(Eval("IsPrint")) ? "鈭�" : "鎵撳嵃"%></span>
+ </td>
+ <td class="td_hide" menu_member_case_id="case_ToAccept" menu_member_case_name="鍙楃悊">
+ <span class="<%#IsCanOpearte(Eval("Keyid"),Eval("OrderState"),Eval("OutId"),"鍙楃悊")?"hand_yes":"hand_no"%>" <%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "鍙楃悊") ?"title='宸插彈鐞�'":"title='鍙楃悊'"%> onclick="ToAccept(<%#Eval("SumPrice" )%>,'<%#Eval("SellerOrderId")%>',<%#Eval("Keyid")%>,<%#Eval("OrderTypeId")%>)">
+ <%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "鍙楃悊") ? "鈭�" : "鍙楃悊"%></span>
+ </td>
+ <td class="td_hide" menu_member_case_id="case_CompledWork" menu_member_case_name="瀹屽伐">
+ <span class="<%#IsCanOpearte(Eval("Keyid"),Eval("OrderState"),Eval("OutId"),"瀹屽伐")?"hand_yes":"hand_no"%>" <%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "瀹屽伐")?"title='宸插畬宸�'":"title='瀹屽伐'"%> style='display: ' onclick="CompledWork(<%#Eval("Keyid")%>)">
+ <%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "瀹屽伐") ? "鈭�" : "瀹屽伐"%></span>
+ </td>
+ <td class="td_hide" menu_member_case_id="case_DeliverWork" menu_member_case_name="閫佽揣">
+ <span class="<%#IsCanOpearte(Eval("Keyid"),Eval("OrderState"),Eval("OutId"),"閫佽揣")?"hand_yes":"hand_no"%>" <%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "閫佽揣")?"title='宸查�佽揣'":"title='閫佽揣'"%> style='display: ' onclick='DeliverWork(<%#Eval("Keyid")%>,"<%#Eval("SellerOrderId")%>","<%#Eval("OrderState")%>")'>
+ <%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "閫佽揣") ? "鈭�" : "閫佽揣"%></span>
+ </td>
+ <td class="td_hide" menu_member_case_id="case_ShowDoDelay" menu_member_case_name="鎾ゅ崟">
+ <span class="<%#IsCanOpearte(Eval("Keyid"),Eval("OrderState"),Eval("OutId"),"鎾ゅ崟")?"hand_yes":"hand_no"%>" <%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "鎾ゅ崟")?"title='宸叉挙鍗�'":"title='鎾ゅ崟'"%> style='display: ' onclick="ShowDoDelay({dtypeId:4,defaultarget:'<%#Eval("TradingSingle.PayedMoney", "{0:F}")%>',orderid:<%#Eval("Keyid")%>,orderShowId:'<%#Eval("SellerOrderId")%>',receiver:'<%#Eval("BuyerId")%>',orderState:'<%#Eval("OrderState")%>',orderType:'<%#Eval("OrderTypeId")%>',title:'鎾ゅ崟绠＄悊' })">
+ <%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "鎾ゅ崟") ? "鈭�" : "鎾ゅ崟"%></span>
+ </td>
+ <td class="td_hide" menu_member_case_id="case_DeferPay" menu_member_case_name="寤舵湡">
+ <span style='display: ' class='hand_no' <%#true.Equals(Eval("IsDeferPay"))?"title='宸插欢鏈�'":"title=''"%>>
+ <%#true.Equals(Eval("IsDeferPay")) ? "鈭�" : ""%></span>
+ </td>
+ <td class="td_hide" menu_member_case_id="case_OpenVisit" menu_member_case_name="鍥炶">
+
+ <span class="<%#IsCanOpearte(Eval("Keyid"),Eval("OrderState"),Eval("OutId"),"鍥炶")?"hand_yes":"hand_no"%>" <%#true.Equals(Eval("IsVisit"))?"title='宸插洖璁�'":"title='鍥炶'"%> style='display: ' onclick='OpenVisit(<%#Eval("Keyid")%>,"<%#Eval("SellerOrderId")%>","<%#Eval("BuyerName")%>")'>
+ <%#true.Equals(Eval("IsVisit")) ? "鈭�" : "鍥炶"%></span>
+ </td>
+ <td class="td_hide" menu_member_case_id="case_evaluationModel" menu_member_case_name="璇勪环">
+ <span class="<%#(int.Parse(Eval("OrderTypeId").ToString())<1)?"hand_yes":"hand_no"%>" <%#true.Equals(Eval("IsEvaluation"))?"title='宸茶瘎浠�'":"title='璇勪环'"%> onclick="evaluationModel(<%#Eval("Keyid")%>)"><%#true.Equals(Eval("IsEvaluation")) ? "鈭�" : "璇勪环"%></span>
+ </td>
+ <td class="td_hide" menu_member_case_id="case_OpenComplainan" menu_member_case_name="鎶曡瘔">
+ <span class="<%#(int.Parse(Eval("OrderTypeId").ToString())<1&&int.Parse(Eval("OrderState").ToString())!=-2)?"hand_yes":"hand_no"%>" <%#true.Equals(Eval("IsComplainant"))?"style='color:Red'":""%> <%#true.Equals(Eval("IsComplainant"))?"title='宸叉姇璇�'":"title='鎶曡瘔'"%> onclick='OpenComplainan(<%#Eval("Keyid")%>,"<%#Eval("SellerOrderId")%>","<%#Eval("BuyerId")%>")'>鎶曡瘔</span>
+ </td>
+ <td class="td_hide" menu_member_case_id="case_onDownLoad" menu_member_case_name="涓嬭浇">
+ <span class="<%#((1.Equals(Eval("IsDownload")))|| (0.Equals(Eval("IsDownload"))))&&(int.Parse(Eval("OrderState").ToString())!=-2)?"hand_yes":"hand_no"%>" <%#1.Equals(Eval("IsDownload"))?"title='宸蹭笅杞�'":"title='涓嬭浇'"%> style='display: ' onclick="onDownLoad('<%#Eval("Keyid")%>')">
+ <%#1.Equals(Eval("IsDownload")) ? "鈭�" : "涓嬭浇"%></span></span>
+ </td>--%>
+ </tr>
+ </itemtemplate>
+ </asp:repeater>
+ </tbody>
+
+ <tr class="StatisticsMoney">
+ <td colspan="12" class="ali03">
+ 鏌ヨ椤圭粺璁★細
+ </td>
+ <td class="ali01" >
+ <span id="AllMoney" runat="server"></span>
+ </td>
+ <td class="ali01">
+ <span id="AlreadyMoney" runat="server"></span>
+ </td>
+ <td class="ali01">
+ <span id="NoMoney" runat="server"></span>
+ </td>
+
+ </tr>
+ </table>
+ <%--<uc:ucpager id="UCPager1" runat="server" />--%>
+ </div>
+ </div>
+ </form>
+</body>
+ <script type="text/javascript" language="javascript">
+ /*
+纭鎵归噺寮�绁ㄧ敵璇�
+*/
+ function ToBatchInvoicingList() {
+
+ var ids = '';
+ var cks = $("input[name='ckId']:checked");
+ if (cks.length == 0)
+ {
+ alertMsg('娌℃湁閫変腑浠讳綍椤癸紒');
+ return;
+ }
+ else
+ {
+ }
+ var isCan = true;
+ var Kaipiaoshenqing = 2;
+
+ var idssss = '';
+
+ var buyerId = '';
+
+ cks.each(
+ function () {
+ var ckVal = $(this).val();
+
+ var ckValJson = eval('(' + ckVal + ')');
+ Kaipiaoshenqing = ckValJson.Kaipiaoshenqing;
+ //鍓旈櫎宸茬粡寮�绁ㄧ敵璇风殑鍗曟嵁
+ if (Kaipiaoshenqing=='' || Kaipiaoshenqing == 2) {
+ ids = ids + ',' + ckValJson.id;
+ } else {
+ idssss = idssss + ',' + ckValJson.orderId;
+ }
+ if (buyerId != '' && ckValJson.buyerId != buyerId) {
+ isCan = false;
+ } else {
+ buyerId = ckValJson.buyerId;
+ }
+
+ }
+ );
+ if (idssss != '') {
+ idssss = idssss.substring(1);
+
+ }
+ if (idssss != '') {
+ alertMsg('鎮ㄩ�変腑鐨勮鍗曚腑鏈夎鍗曞凡缁忔彁浜や簡寮�绁ㄧ敵璇凤紒鎾ら攢鈥滃紑绁ㄧ敵璇封�濆悗鎵嶈兘閲嶆柊鎻愪氦寮�绁ㄧ敵璇�!\n' + idssss);
+ return;
+ }
+
+ if (!isCan) {
+ alertMsg('璇烽�夋嫨鍚屼竴涓鎴风殑璁㈠崟锛�');
+ }
+ else {
+ if (ids != '') {
+ ids = ids.substring(1);
+
+ } else {
+ alertMsg('娌℃湁閫変腑鏈敵璇峰紑绁ㄨ鍗曪紒');
+ return;
+ }
+
+ kaipiaoConfirm(ids);
+ //var msg = ('纭寮�绁ㄧ敵璇峰悧?');
+ //top.Dialog.confirm(msg, function () {
+ // DoAcceptAll3(ids);
+ //});
+ }
+ }
+
+ /*
+ 鎵归噺澶勭悊寮�绁ㄧ敵璇�
+ */
+ var DoAcceptAll3 = function (orderIds) {
+ window.submitUrl = "/Pages/business/OrderListBatchOperation.aspx"
+ CallServer({ Target: "deleteOrderAll3", ids: orderIds }, function (data, textStatus) {
+ if ('1' == data) {
+ alertMsg('鎿嶄綔鎴愬姛锛�');
+ RefreshDIVOpener(); //鍏抽棴椤甸潰
+ } else {
+ alertMsg('-1' == data ? '寮�绁ㄧ敵璇峰け璐ワ紒' : '寮�绁ㄧ敵璇峰け璐ワ紒');
+ //dialog.close();
+ }
+ });
+ }
+
+
+ /*
+纭鎵归噺鍘婚櫎
+*/
+ function ToBatchRemove() {
+
+ var ids = '';
+ var cks = $("input[name='ckId']:checked");
+ if (cks.length == 0) { alertMsg('娌℃湁閫変腑浠讳綍椤癸紒'); return; } else { }
+ var isCan = true;
+
+
+
+
+ cks.each(
+ function () {
+ //var ckVal = $(this).val();
+
+ //var ckValJson = eval('(' + ckVal + ')');
+
+ //ids = ids + ',' + ckValJson.id;
+ n = $(this).parents("tr").index()+1; // 鑾峰彇checkbox鎵�鍦ㄨ鐨勯『搴�
+ $("table#test_table").find("tr:eq(" + n + ")").remove();
+
+ }
+ );
+
+ var i = 1;
+
+ $(".ItemIndex").each(function (ii, vv) {
+
+ $(vv).text(i)
+ i = i + 1;
+ });
+
+
+ var value_SumPrice = 0;
+ $(".SumPrice").each(function (ii, vv) {
+ value_SumPrice += parseFloat($(vv).text());
+ });
+ $("#AllMoney").html(value_SumPrice.toFixed(2));
+
+ var value_PayedMoney = 0;
+ $(".PayedMoney").each(function (ii, vv) {
+ value_PayedMoney += parseFloat($(vv).text());
+ });
+ $("#AlreadyMoney").html(value_PayedMoney.toFixed(2));
+
+ var value_UnPayedMoney = 0;
+ $(".UnPayedMoney").each(function (ii, vv) {
+ value_UnPayedMoney += parseFloat($(vv).text());
+ });
+ $("#NoMoney").html(value_UnPayedMoney.toFixed(2));
+
+ //if (!isCan) {
+ // // alertMsg('璇烽�夋嫨鏈彈鐞嗙殑璁㈠崟锛�');
+ //}
+ //else {
+ // if (ids != '') {
+ // ids = ids.substring(1);
+
+ // }
+
+ // var msg = ('纭鍘婚櫎鍚�?');
+ // top.Dialog.confirm(msg, function () {
+ // DoAcceptAll2(ids );
+ // });
+ //}
+ }
+
+ /*
+ 鎵归噺澶勭悊鍙楃悊璁㈠崟
+ */
+ var DoAcceptAll2 = function (orderIds) {
+ window.submitUrl ="/Pages/business/OrderListBatchOperation.aspx"
+ CallServer({ Target: "deleteOrderAll2", ids: orderIds }, function (data, textStatus) {
+ if ('1' == data) {
+ alertMsg('鎿嶄綔鎴愬姛锛�');
+ RefreshDIVOpener(); //鍏抽棴椤甸潰
+ } else {
+ alertMsg('-1' == data ? '鍘婚櫎璁㈠崟澶辫触锛�' : '鍘婚櫎璁㈠崟澶辫触锛�');
+ //dialog.close();
+ }
+ });
+ }
+
+
+ /*
+纭鎵归噺寮�绁ㄧ敵璇�
+*/
+ function ToBatchPayList() {
+
+ var ids = '';
+ var cks = $("input[name='ckId']:checked");
+ if (cks.length == 0) { alertMsg('娌℃湁閫変腑浠讳綍椤癸紒'); return; } else { }
+ var isCan = true;
+ var PayState = 2;
+ var SellerOrderIds = '';
+
+
+ cks.each(
+ function () {
+ var ckVal = $(this).val();
+
+ var ckValJson = eval('(' + ckVal + ')');
+ PayState = ckValJson.PayState;
+ //鍓旈櫎宸茬粡寮�绁ㄧ敵璇风殑鍗曟嵁
+ if (PayState != -1) {
+ ids = ids + ',' + ckValJson.id;
+
+ } else {
+ SellerOrderIds = SellerOrderIds + ',' + ckValJson.orderId;
+ }
+
+
+ }
+ );
+
+ if (SellerOrderIds != '') {
+ SellerOrderIds = SellerOrderIds.substring(1);
+
+ }
+ if (SellerOrderIds != '') {
+ alertMsg('鎮ㄩ�変腑鐨勮鍗曚腑鏈夎鍗曞凡缁忔敮浠樺畬姣�!\n' + SellerOrderIds);
+ return;
+ }
+
+
+ if (!isCan) {
+ // alertMsg('璇烽�夋嫨鏈彈鐞嗙殑璁㈠崟锛�');
+ }
+ else {
+ if (ids != '') {
+ ids = ids.substring(1);
+ SellerOrderIds = SellerOrderIds.substring(1);
+
+ } else {
+ alertMsg('娌℃湁閫変腑鏈敮浠樿鍗曪紒');
+ return;
+ }
+
+ top.Dialog.open({ URL: '/Pages/financial/OrderMoneyBatchReceive.aspx?id=' + ids, Title:'鎵归噺鏀舵', Height: 400, Width: 600 });
+ }
+ }
+
+
+ </script>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx.cs
new file mode 100644
index 0000000..a1dbd80
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx.cs
@@ -0,0 +1,891 @@
+锘�/**
+* 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;
+
+namespace CY.WebForm.Pages.business
+{
+ /// <summary>
+ /// 璁㈠崟鍒楄〃鐣岄潰绫�
+ /// </summary>
+ public partial class OrderListBatchKaipiao : BasePage
+ {
+
+ EC_OrderBasicBLL _eC_OrderBasicBLL = null;
+ OA_StaffBLL bll_OA_StaffBLL = null;
+ LF_OrderFileBLL _lF_OrderFileBLL = null;
+ EC_OrderBLL _eC_OrderBLL = null;
+ OA_KaipiaoshenqingBLL _oA_KaipiaoshenqingBLL = null;
+ OA_CorporateClientsBLL _oA_CorporateClientsBLL = null;
+
+ /// <summary>
+ /// 鍒濆鍖栨瀯閫�
+ /// </summary>
+ public OrderListBatchKaipiao()
+ {
+ _eC_OrderBasicBLL = new EC_OrderBasicBLL();
+ bll_OA_StaffBLL = new OA_StaffBLL();
+ _lF_OrderFileBLL = new LF_OrderFileBLL();
+ _eC_OrderBLL = new EC_OrderBLL();
+ _oA_KaipiaoshenqingBLL = new OA_KaipiaoshenqingBLL();
+ _oA_CorporateClientsBLL = new OA_CorporateClientsBLL();
+ }
+
+ /// <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锛岃繖鏍峰彲浠ョ紦瑙ｆ湇鍔″櫒鐨勫帇鍔�
+ 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/OrderListBatchKaipiao.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();//鍗板埛涓氬姟绫诲瀷涓氬姟閫昏緫鎿嶄綔绫诲璞�
+
+ this.selPrintTypes.DataSource = _sysInquiry_PrintingTypeBLL.SelectUsedModles();
+ this.selPrintTypes.DataBind();
+ this.selPrintTypes.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+ this.selPrintTypes.Items.Add(new ListItem("鍏朵粬", "-1"));
+
+ //this.selOrderTypes.DataSource = _sys_DictionaryBLL.GetDataByType("EC_璁㈠崟绫诲瀷");
+ //this.selOrderTypes.DataBind();
+ //this.selOrderTypes.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+
+ //this.selPayStates.DataSource = _sys_DictionaryBLL.GetDataByType("EC_璁㈠崟鏀粯鐘舵��");
+ //this.selPayStates.DataBind();
+ //this.selPayStates.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+
+ //this.selOrderStates.DataSource = _sys_DictionaryBLL.GetDataByType("EC_璁㈠崟鐘舵��").Where(p => p.MeanValue.Value != -5 && p.MeanValue.Value != -4);
+ //this.selOrderStates.DataBind();
+ //this.selOrderStates.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+
+ //this.selCustormerLevels.DataSource = _sys_DictionaryBLL.GetDataByType("瀹㈡埛閲嶈绋嬪害");
+ //this.selCustormerLevels.DataBind();
+ //this.selCustormerLevels.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+
+ //this.selPayType.DataSource = _sys_DictionaryBLL.GetDataByType("EC_鏀粯鏂瑰紡");
+ //this.selPayType.DataTextField = "Name";
+ //this.selPayType.DataValueField = "MeanValue";
+ //this.selPayType.DataBind();
+ //this.selPayType.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+
+ this.selCustormerManager.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, false, true);
+ this.selCustormerManager.DataTextField = "Name";
+ this.selCustormerManager.DataValueField = "Keyid";
+ this.selCustormerManager.DataBind();
+ this.selCustormerManager.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+ //this.selCustormerManager.Items.Insert(1, new ListItem(CurrentUser.ShortName, CurrentUser.ShortName));
+
+ this.selBusinessManager.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, true, false);
+ this.selBusinessManager.DataTextField = "Name";
+ this.selBusinessManager.DataValueField = "Keyid";
+ this.selBusinessManager.DataBind();
+ this.selBusinessManager.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+ //this.selBusinessManager.Items.Insert(1, new ListItem(CurrentUser.ShortName, CurrentUser.ShortName));
+
+ this.txtBeginData.Value = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd");
+ this.txtEndDate.Value = DateTime.Now.ToString("yyyy-MM-dd");
+
+ //鍒濇鏁版嵁鍔犺浇
+ btn_Search_Click(btn_Search, new EventArgs());
+ }
+ }
+
+ #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, this.txtOrderId.Value.Trim());
+ SetParamValue(searchParam, 3, this.txtCustormerName.Value.Trim());
+ SetParamValue(searchParam, 4, this.txtBeginData.Value.Trim());
+ SetParamValue(searchParam, 5, this.txtEndDate.Value.Trim());
+ SetParamValue(searchParam, 6, this.selPrintTypes.Value);
+ SetParamValue(searchParam, 7, "");//this.selOrderTypes.Value
+ SetParamValue(searchParam, 8, "");//this.selOrderStates.Value
+ SetParamValue(searchParam, 9, "");//this.selPayStates.Value
+ SetParamValue(searchParam, 10, this.txtCreaterName.Value.Trim());
+ SetParamValue(searchParam, 11, "");//this.selCustormerLevels.Value
+ SetParamValue(searchParam, 12, this.selCustormerManager.Value);
+ SetParamValue(searchParam, 13, this.selBusinessManager.Value);
+ SetParamValue(searchParam, 14, "");//this.selPayType.SelectedValue
+ SetParamValue(searchParam, 15, "");//this.selReturnvisit.SelectedValue
+ SetParamValue(searchParam, 16, "");//this.selAppraise.SelectedValue
+ SetParamValue(searchParam, 18, 0); //(CurrentUser.StaffId > 0 ? 1 : 0)
+ SetParamValue(searchParam, 19, CurrentUser.TrueMemberId);
+ SetParamValue(searchParam, 20, CurrentUser.StaffId);
+ SetParamValue(searchParam, 21, CurrentUser.TrueName);
+ SearchParam = searchParam;
+
+
+ /// UCPager1.AspNetPager.CurrentPageIndex = 1;//閲嶇疆椤垫暟
+ //鍐嶆鏌ヨ
+ // AspNetPager_PageChanged(UCPager1.AspNetPager, new EventArgs());
+ Infrastructure.Query.Pagination pagination = new Infrastructure.Query.Pagination()
+ {
+ PageSize = 500,// UCPager1.AspNetPager.PageSize,
+ PageIndex = 1// UCPager1.AspNetPager.CurrentPageIndex
+ };
+ IEnumerable<EC_OrderBasic> result = _eC_OrderBasicBLL.SelectModelPage_Seller(pagination, SearchParam);//.Where(x => x.OrderState != 0) .Where(x=>x.Quchudingdan == 2);
+ rptData.DataSource = result;
+ rptData.DataBind();
+
+ //EC_OrderBasic m_EC_OrderBasic = _eC_OrderBasicBLL.SumOrderMoney_receive(pagination, SearchParam);
+ //if (m_EC_OrderBasic != null)
+ //{
+ // //this.AllMoney.InnerText = (m_EC_OrderBasic.OrAllTradingMoney * 9 ?? 0).ToString("0.00");
+ // //this.AlreadyMoney.InnerText = (m_EC_OrderBasic.OrAllPayedMoney * 9 ?? 0).ToString("0.00");
+ // //this.NoMoney.InnerText = (m_EC_OrderBasic.OrAllUnPayedMoney * 9 ?? 0).ToString("0.00");
+ // this.AllMoney.InnerText = (m_EC_OrderBasic.OrAllTradingMoney ?? 0).ToString("0.00");
+ // this.AlreadyMoney.InnerText = (m_EC_OrderBasic.OrAllPayedMoney ?? 0).ToString("0.00");
+ // this.NoMoney.InnerText = (m_EC_OrderBasic.OrAllUnPayedMoney ?? 0).ToString("0.00");
+ //}
+
+ }
+
+ /// <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 = 1000,// UCPager1.AspNetPager.PageSize,
+ PageIndex = 1// UCPager1.AspNetPager.CurrentPageIndex
+ };
+ IEnumerable<EC_OrderBasic> result = _eC_OrderBasicBLL.SelectModelPage_Seller(pagination, SearchParam);
+ rptData.DataSource = result;
+ rptData.DataBind();
+
+ //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(',');
+ if (idsArray != null && idsArray.Length > 0)
+ {
+ EC_OrderBasic eC_OrderBasic = _eC_OrderBasicBLL.SelectModelById(idsArray[0].ToInt32().Value);
+ OA_CorporateClients oA_CorporateClients = _oA_CorporateClientsBLL.SelectModelByFirmIdandMemberId(CurrentUser.MemberId, eC_OrderBasic.BuyerId);
+ using (TransactionScope scope = new TransactionScope())
+ {
+
+
+ string ssss = DateTime.Now.ToString("yyyyMMdd");
+ string SellerOrderId = ssss + 1.ToString("000");
+
+ string maxSellerOrderId = _oA_KaipiaoshenqingBLL.GetModelByformid(CurrentUser.MemberId).Where(x => x.SellerOrderId.Contains(ssss)).Max(x => x.SellerOrderId);
+ if (!string.IsNullOrWhiteSpace(maxSellerOrderId))
+ {
+ string aaaaaaaaaaaa = maxSellerOrderId.Substring(maxSellerOrderId.Length - 3, 3);
+ SellerOrderId = ssss + (aaaaaaaaaaaa.ToInt32().Value + 1).ToString("000");
+ }
+ OA_Kaipiaoshenqing oA_DeliverPlan = new OA_Kaipiaoshenqing();
+
+
+ oA_DeliverPlan.Keyid = Guid.NewGuid();
+ oA_DeliverPlan.FirmId = CurrentUser.MemberId;
+ oA_DeliverPlan.BuyerId = eC_OrderBasic.BuyerId;
+ oA_DeliverPlan.Kaipiaoshenqing = 1;
+ oA_DeliverPlan.Kehuqianshou = 1;
+ oA_DeliverPlan.SellerOrderId = SellerOrderId;
+
+
+ oA_DeliverPlan.KehuqianshouTime = null;
+ oA_DeliverPlan.KehuqianshouCreater = null;
+ oA_DeliverPlan.KaipiaoquerenTime = null;
+ oA_DeliverPlan.KaipiaoquerenCreater = null;
+ oA_DeliverPlan.BusinessManagerId = oA_CorporateClients.BusinessManagerId ?? 0;
+
+ oA_DeliverPlan.Creater = CurrentUser.TrueMemberId;
+ oA_DeliverPlan.CreateTime = DateTime.Now;
+ oA_DeliverPlan.Updater = CurrentUser.TrueMemberId;
+ oA_DeliverPlan.LastUpdateTime = DateTime.Now;
+
+ _oA_KaipiaoshenqingBLL.InsertModel(oA_DeliverPlan);
+
+
+
+ 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;
+ model.KaipiaoshenqingId = oA_DeliverPlan.Keyid;
+
+ 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/OrderListBatchKaipiao.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx.designer.cs
new file mode 100644
index 0000000..8458778
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx.designer.cs
@@ -0,0 +1,170 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.business
+{
+
+
+ public partial class OrderListBatchKaipiao
+ {
+
+ /// <summary>
+ /// Head1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
+
+ /// <summary>
+ /// CMSHead1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
+
+ /// <summary>
+ /// form1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+ /// <summary>
+ /// txtBeginData 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtBeginData;
+
+ /// <summary>
+ /// txtEndDate 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtEndDate;
+
+ /// <summary>
+ /// txtOrderId 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtOrderId;
+
+ /// <summary>
+ /// selPrintTypes 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selPrintTypes;
+
+ /// <summary>
+ /// txtCreaterName 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtCreaterName;
+
+ /// <summary>
+ /// txtCustormerName 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtCustormerName;
+
+ /// <summary>
+ /// selCustormerManager 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selCustormerManager;
+
+ /// <summary>
+ /// selBusinessManager 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selBusinessManager;
+
+ /// <summary>
+ /// btn_Search 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button btn_Search;
+
+ /// <summary>
+ /// txtCommission 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputHidden txtCommission;
+
+ /// <summary>
+ /// rptData 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Repeater rptData;
+
+ /// <summary>
+ /// AllMoney 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl AllMoney;
+
+ /// <summary>
+ /// AlreadyMoney 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl AlreadyMoney;
+
+ /// <summary>
+ /// NoMoney 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl NoMoney;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx.cs
index 71d0eed..2e83a88 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx.cs
@@ -504,7 +504,7 @@
this.selBusinessManager.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
//this.selBusinessManager.Items.Insert(1, new ListItem(CurrentUser.ShortName, CurrentUser.ShortName));
- this.txtBeginData.Value = DateTime.Now.AddDays(-14).ToString("yyyy-MM-dd");
+ this.txtBeginData.Value = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd");
this.txtEndDate.Value = DateTime.Now.ToString("yyyy-MM-dd");
//鍒濇鏁版嵁鍔犺浇
@@ -546,7 +546,7 @@
SetParamValue(searchParam, 14, this.selPayType.SelectedValue);
SetParamValue(searchParam, 15, this.selReturnvisit.SelectedValue);
SetParamValue(searchParam, 16, this.selAppraise.SelectedValue);
- SetParamValue(searchParam, 18, (CurrentUser.StaffId > 0 ? 1 : 0));
+ SetParamValue(searchParam, 18, 0); //(CurrentUser.StaffId > 0 ? 1 : 0)
SetParamValue(searchParam, 19, CurrentUser.TrueMemberId);
SetParamValue(searchParam, 20, CurrentUser.StaffId);
SetParamValue(searchParam, 21, CurrentUser.TrueName);
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx
index c2bdefb..3553648 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx
@@ -17,6 +17,19 @@
<td class="ali03">寮�绁ㄩ噾棰濓細</td>
<td><span id="kpmoney" runat="server"></span></td>
</tr>
+ <tr>
+ <td class="ali03">涓氬姟缁忕悊锛�</td>
+ <td> <select keepdefaultstyle='true' id='selBusinessManager' runat="server" datatextfield='Name' datavaluefield='Keyid'>
+ </select></td>
+ </tr>
+ <tr>
+ <td class="ali03">澧炲噺閲戦锛�</td>
+ <td> <input id='txtZengjianmoney' runat="server" maxlength='18' onblur="validateAmount(event)" placeholder="璇疯緭鍏ュ鍑忛噾棰�" /></td>
+ </tr>
+ <tr>
+ <td class="ali03"> </td>
+ <td ><span style="color:red;" >澧炲噺閲戦涓鸿礋鏁伴渶瑕佸鎵癸紒</span></td>
+ </tr>
<tr>
<td class="ali03">寮�绁ㄥ強寮傚父閲戦璇存槑锛�</td>
<td>
@@ -37,4 +50,18 @@
</table>
</form>
</body>
+ <script type="text/javascript" language="javascript">
+ function validateAmount(event) {
+ var input = event.target;
+ var value = input.value;
+ var regex = /^-?\d+(\.\d+)?$/;
+
+ if (!regex.test(value)) {
+ // 杈撳叆鏃犳晥锛岄噸缃�煎苟灏嗙劍鐐硅鍥炴枃鏈
+ input.value = '0';
+ input.focus();
+ alert('璇疯緭鍏ユ湁鏁堢殑姝ｈ礋閲戦锛屼緥濡� +123 鎴� -45.67');
+ }
+ }
+ </script>
</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx.cs
index 5a982f0..df66488 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx.cs
@@ -22,6 +22,8 @@
EC_OrderBLL _eC_OrderBLL = null;
OA_KaipiaoshenqingBLL _oA_KaipiaoshenqingBLL = null;
OA_CorporateClientsBLL _oA_CorporateClientsBLL = null;
+ OA_StaffBLL bll_OA_StaffBLL = null;
+ OA_WorkPlanBll oA_WorkReminderBll = null;
//鍒濆鍖�
@@ -31,6 +33,8 @@
_eC_OrderBLL = new EC_OrderBLL();
_oA_CorporateClientsBLL = new OA_CorporateClientsBLL();
_oA_KaipiaoshenqingBLL = new OA_KaipiaoshenqingBLL();
+ bll_OA_StaffBLL = new OA_StaffBLL();
+ oA_WorkReminderBll = new OA_WorkPlanBll();
}
//椤甸潰鍔犺浇
@@ -48,6 +52,13 @@
string orderIdStr = Request["id"];
if (!string.IsNullOrEmpty(orderIdStr))
{
+ this.selBusinessManager.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, true, false);
+ this.selBusinessManager.DataTextField = "Name";
+ this.selBusinessManager.DataValueField = "Keyid";
+ this.selBusinessManager.DataBind();
+ //this.selBusinessManager.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+ //this.selBusinessManager.Items.Insert(1, new ListItem(CurrentUser.ShortName, CurrentUser.ShortName));
+
decimal total = 0;
string name = "";
this.txtOrderIds.Value = orderIdStr;
@@ -59,10 +70,12 @@
var models = _eC_OrderBLL.GetOrderByIds(orderIdStr).ToList();
if(models!=null&& models.Count > 0)
{
+ var model = bll_EC_OrderBasicBLL.SelectModelById(models[0].Keyid.Value);
name = models[0].BuyerName;
+ this.selBusinessManager.Value = model.BusinessManagerId.HasValue? model.BusinessManagerId.Value.ToString():"";
}
total = models.Sum(x=>x.SumPrice)??0;
-
+ txtZengjianmoney.Value = "0";
//foreach (var item in idsArray)
@@ -77,7 +90,7 @@
// }
// }
//}
- //}
+ //}
kpmoney.InnerText = total.ToString("0.00");
khname.InnerText = name;
}
@@ -140,7 +153,58 @@
oA_DeliverPlan.KehuqianshouCreater = null;
oA_DeliverPlan.KaipiaoquerenTime = null;
oA_DeliverPlan.KaipiaoquerenCreater = null;
- oA_DeliverPlan.BusinessManagerId = oA_CorporateClients.BusinessManagerId ?? 0;
+ oA_DeliverPlan.BusinessManagerId = this.selBusinessManager.Value.ToInt32();
+ oA_DeliverPlan.Zengjianmoney = this.txtZengjianmoney.Value.ToDecimal2();
+ oA_DeliverPlan.kpmoney = this.kpmoney.InnerText.ToDecimal2();
+ oA_DeliverPlan.ApprovalStatus = 1;
+ oA_DeliverPlan.Dingdanshu = ids.Trim(',').Split(',').Length;
+ if (oA_DeliverPlan.Zengjianmoney < 0)
+ {
+ oA_DeliverPlan.ApprovalStatus = 0;
+ //闇�瑕佹坊鍔犲鎵逛俊鎭�
+ DateTime nowTime = DateTime.Now;
+ OA_WorkPlan m_OA_WorkPlan = new OA_WorkPlan();
+ m_OA_WorkPlan.ApprovalContent = "";
+ m_OA_WorkPlan.ApprovalStaffId = Guid.Empty;
+ m_OA_WorkPlan.ApprovalStaffName = "";
+ m_OA_WorkPlan.ApprovalStatus = 0;
+ m_OA_WorkPlan.ApprovalTime = nowTime;
+ m_OA_WorkPlan.EvaluationContent = "";
+ m_OA_WorkPlan.EvaluationStaff = "";
+ m_OA_WorkPlan.EvaluationStaffId = Guid.Empty;
+ m_OA_WorkPlan.EvaluationStatus = 0;
+ m_OA_WorkPlan.EvaluationTime = nowTime;
+ m_OA_WorkPlan.RewardContent = "";
+ m_OA_WorkPlan.RewardMoney = 0;
+ m_OA_WorkPlan.RewardResult = "";
+ m_OA_WorkPlan.RewardType = 0;
+
+ m_OA_WorkPlan.PlanStartTime = nowTime;
+ m_OA_WorkPlan.PlanStatus = 1;
+ m_OA_WorkPlan.SentStaffId = CurrentUser.TrueMemberId;
+ m_OA_WorkPlan.MemberId = CurrentUser.MemberId;
+
+ OA_Staff m_OA_Staff = bll_OA_StaffBLL.GetModelByMemberId(CurrentUser.TrueMemberId);
+ if (m_OA_Staff != null)
+ m_OA_WorkPlan.DepartId = m_OA_Staff.DepartmentId;
+ else
+ m_OA_WorkPlan.DepartId = 0;
+
+ m_OA_WorkPlan.PlanPeople = CurrentUser.TrueName;
+ m_OA_WorkPlan.ReciveStaffId = CurrentUser.TrueMemberId;
+
+ m_OA_WorkPlan.Operator = CurrentUser.ShortName;
+ m_OA_WorkPlan.PlanComplany = oA_DeliverPlan.Keyid.ToString();
+ m_OA_WorkPlan.PlanContent = this.khname.InnerText+" 鍑忓皯閲戦寮�绁ㄧ敵璇�";
+ m_OA_WorkPlan.PlanDataType = 13;
+ m_OA_WorkPlan.PlanMoney = oA_DeliverPlan.Zengjianmoney;
+ m_OA_WorkPlan.PlanRemark = oA_DeliverPlan.remark;
+ m_OA_WorkPlan.PlanRunTime = DateTime.Now;
+ m_OA_WorkPlan.PlanTitle = this.khname.InnerText + " 鍑忓皯閲戦寮�绁ㄧ敵璇�";
+ m_OA_WorkPlan.PlanType = 3;
+ m_OA_WorkPlan.LastUpdateTime = nowTime;
+ oA_WorkReminderBll.InsertModel(m_OA_WorkPlan);
+ }
oA_DeliverPlan.Creater = CurrentUser.TrueMemberId;
oA_DeliverPlan.CreateTime = DateTime.Now;
@@ -179,9 +243,10 @@
scope.Dispose();
}
}
- JavaScript.MessageBox("鎻愪氦鎴愬姛", this);
+ //JavaScript.MessageBox("鎻愪氦鎴愬姛", this);
- JavaScript.RefreshDIVOpener(this);
+ //鎿嶄綔鎴愬姛
+ JavaScript.MessageBoxsssss("鎻愪氦鎴愬姛", this, true, true);
}
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx.designer.cs
index b914e62..f88cdc0 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx.designer.cs
@@ -42,6 +42,24 @@
protected global::System.Web.UI.HtmlControls.HtmlGenericControl kpmoney;
/// <summary>
+ /// selBusinessManager 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selBusinessManager;
+
+ /// <summary>
+ /// txtZengjianmoney 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtZengjianmoney;
+
+ /// <summary>
/// txtContent 鎺т欢銆�
/// </summary>
/// <remarks>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/InvoicingShoukuan.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/financial/InvoicingShoukuan.aspx
new file mode 100644
index 0000000..f0a194c
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/InvoicingShoukuan.aspx
@@ -0,0 +1,390 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="InvoicingShoukuan.aspx.cs" Inherits="CY.WebForm.Pages.financial.InvoicingShoukuan" %>
+
+<!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">
+ var accountsTypes = false;
+ var accounts = false;
+
+ var keyDownHook = new KeyBehaviorHook('keydown');
+ keyDownHook.Regist(window.Keys.S, "ClickElement('btnSubmit')", window.WithKey.Ctrl); //Ctrl+s 淇濆瓨
+ keyDownHook.Regist(window.Keys.Enter, "ClickElement('btnSubmit')", window.WithKey.Ctrl); //Ctrl+Enter 淇濆瓨
+ keyDownHook.Regist(window.Keys.R, "ClickElement('btnReset')", window.WithKey.Ctrl); //Ctrl+R 閲嶇疆(Reset)
+ keyDownHook.Regist(window.Keys.Q, "ClickElement('btnQuit')", window.WithKey.Ctrl); //Ctrl+Q 閫�鍑�(Quit)
+
+ function jisuanheji() {
+
+ var cks = $("input[name='ckId']:checked");
+
+ if (cks.length == 0) { $("#NoMoney").text("0"); return; } else { }
+
+ var unPayedMoney = 0;
+
+
+ cks.each(
+ function () {
+ var ckVal = $(this).val();
+
+ var ckValJson = eval('(' + ckVal + ')');
+ unPayedMoney += parseFloat(ckValJson.unPayedMoney) ;
+
+
+
+ }
+ );
+
+ $("#NoMoney").text(unPayedMoney);
+
+ }
+
+ $(function () {
+
+ $('.hand').click(function () {
+ jisuanheji();
+ });
+
+
+ keyDownHook.Binding();
+ 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('txtUnPayedMoney').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 = [];
+ }
+
+ LoadAccountType();
+ });
+
+ function QuannbuCheckedChanging(sel) {
+ if (sel.value == "0") {
+ $("#txtReceiveMoney").prop('readonly', true);
+ $("#txtReceiveMoney").val($("#hidReceiveMoney").val());
+ $("#test_table").hide();
+ } else if (sel.value == "1")
+ {
+ $("#txtReceiveMoney").prop('readonly', false);
+
+ $("#test_table").show();
+ }
+ }
+ function CheckStaff() {
+
+ var selectedValue = $('input[name="rdoReceiveQuannbu"]:checked').val();
+ if (selectedValue == "1") {
+ var ids = '';
+ var cks = $("input[name='ckId']:checked");
+ if (cks.length == 0) {
+ alertMsg('娌℃湁閫変腑浠讳綍椤癸紒');
+ return false;
+ }
+ else {
+ }
+
+
+
+
+
+
+ cks.each(
+ function () {
+ var ckVal = $(this).val();
+
+ var ckValJson = eval('(' + ckVal + ')');
+
+ ids = ids + ',' + ckValJson.id;
+
+
+ }
+ );
+
+
+ $("#ids").val(ids);
+ return true;
+ }
+
+ return true;
+ }
+
+ function CheckedChanging(sel, name) {
+
+ var td_toaccount = document.getElementById('td_toaccount');
+ td_toaccount.parentNode.style.display = td_toaccount.style.display = name ? '' : 'none';
+
+ if (!name) { return; }
+ var currentAccounts = accounts[name];
+ var selAccounts = document.getElementById('selAccounts');
+ selAccounts.options.length = 0;
+ var i = -1;
+ while (++i < currentAccounts.length) {
+ var optionItem = document.createElement('option');
+ optionItem.value = currentAccounts[i].Keyid;
+ optionItem.innerHTML = currentAccounts[i].AccountName + '-' + currentAccounts[i].UserName;
+ selAccounts.appendChild(optionItem);
+ }
+ };
+
+ function LoadAccountType() {
+ var td_receiveWay = document.getElementById('td_receiveWay');
+ td_receiveWay.parentNode.style.display = td_receiveWay.style.display = '<%=Request["isprepareway"] %>';
+ if (td_receiveWay.style.display) { return; } else;
+ var thtml = '';
+ var i = -1;
+ while (++i < accountsTypes.length) {
+ thtml += ("<input type='radio' name='rdoReceiveWay' id='rdoReceiveWay" + accountsTypes[i].Keyid + "' value='"
+ + accountsTypes[i].Keyid + "' onclick=\"CheckedChanging(this,'" + accountsTypes[i].Name + "')\" /><label for='rdoReceiveWay" + accountsTypes[i].Keyid + "'>" + accountsTypes[i].Name + "</label>　 ");
+ }
+ document.getElementById('spn_receiveWay').innerHTML = thtml;
+
+ }
+ /*
+ 楠岃瘉杈撳叆浠锋牸
+ */
+ function ValidateInputPrice(txt) {
+ if (!ValidateDecimal(txt)) return; else;
+ try {
+ var inputPrice = parseFloat(txt.value);
+ var unPayed = parseFloat(document.getElementById('hidReceiveMoney').value);
+ txt.value = isNaN(inputPrice) || isNaN(unPayed) ? 0 : txt.value;
+ if (inputPrice > unPayed) { alertMsg(' 鏈鏀舵閲戦澶т簬璁㈠崟鏈粯娆�!<br/>涓轰簡鎮ㄧ殑璐﹀姟姝ｇ‘鎬ц閲嶆柊澶嶆煡锛�'); }
+
+ } 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="table2" width="100%">
+ <%-- <asp:Repeater runat="server" ID="rptOrderInfo">
+ <ItemTemplate>
+
+ <tbody>
+ <tr>
+ <td class='col_third'>
+ 　璁㈠崟鍙凤細<%#Eval("SellerOrderId") %>
+ </td>
+ <td class='col_third'>
+ 鍗颁欢鍚嶇О锛�<%#Eval("DocumentName") %>
+ </td>
+ <td class='col_third'>
+ 璁㈠崟绫诲瀷锛�<%#Eval("OrderType.Name")%>
+ </td>
+ </tr>
+ <tr>
+ <td class='col_third'>
+ 璁㈠崟鐘舵�侊細<%#Eval("OrderStateObj.Name") %>
+ </td>
+ <td class='col_third'>
+ 瀹㈡埛鍚嶇О锛�<%#Eval("BuyerName") %>
+ </td>
+ <td class='col_third'>
+ 鍗板埛鏁伴噺锛�<%#Eval("OrderExtend.PrintNum")%>
+ </td>
+ </tr>
+ <tr>
+ <td class='col_third'>
+ 璁㈠崟鍗曚环锛�<strong class="moneystyle">锟�<%#Eval("UnitPrice","{0:F2}")%></strong>
+ </td>
+ <td class='col_third'>
+ 璁㈠崟鎬讳环锛�<strong class="moneystyle">锟�<%#Eval("SumPrice","{0:F2}")%></strong>
+ </td>
+ <td class='col_third'>
+ 绾夸笂浠樻锛�<strong class="moneystyle">锟�<%#Eval("TradingSingle.OnlineMoney", "{0:F2}")%></strong>
+ </td>
+ </tr>
+ <tr>
+ <td class='col_third'>
+ 绾夸笅鏀舵锛�<strong class="moneystyle">锟�<%#Eval("TradingSingle.LineMoney", "{0:F2}")%></strong>
+ </td>
+
+ <td class='col_third'>
+ 　鏈敹娆撅細<strong class="moneystyle">锟�<%#Eval("UnPayedMoney","{0:F}")%></strong><input type='hidden' name='txtUnPayedMoney' value='<%#Eval("UnPayedMoney","{0:F}")%>' />
+ </td>
+ <td class='col_third'>
+ (鍓╀綑棰勪粯娆撅細<span class="moneystyle"><%#Eval("nowCustomMoney")%></span>锛屽墿浣欐巿淇★細<span class="moneystyle"><%#Eval("nowCredit")%></span>)
+ </td>
+ </tr>
+ </ItemTemplate>
+ </asp:Repeater>--%>
+ <tr>
+ <td colspan='3' class='col_third'>
+ 瀹㈡埛鍚嶇О锛�
+ <input id='txtBuyerName' runat="server" style='width: 220px;' readonly="readonly" />
+ </td>
+ </tr>
+ <tr>
+ <td colspan='3' class='col_third'>
+ 鍙戠エ鍙凤細
+ <input id='txtFapiaohao' runat="server" style='width: 220px;' readonly="readonly" />
+ </td>
+ </tr>
+ <tr>
+ <td colspan='3' class='col_third'>
+ 搴旀敹娆撅細
+ <input id='txtSumMoney' runat="server" style='width: 120px;' onblur='ValidateInputPrice(this)' readonly="readonly" />
+ <input type="hidden" runat="server" id='hidReceiveMoney' />
+ </td>
+ </tr>
+ <tr>
+ <td colspan='3' class='col_third'>
+ 鏀舵閲戦锛�
+ <input id='txtReceiveMoney' runat="server" maxlength='16' style='width: 120px;' onblur='ValidateInputPrice(this)' readonly="readonly" />
+ </td>
+ </tr>
+ <tr>
+ <td colspan='3' class='col_third' id='td_receiveWay'>
+ 鏀舵鏂瑰紡锛�<span id='spn_receiveWay'></span>
+ <input type="radio" name='rdoReceiveWay' id='rdoReceiveWay0' value='0' checked="checked" onclick="CheckedChanging(this,'')" /><label for='rdoReceiveWay0'>棰勪粯娆�</label>
+
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan='3' class='col_third' >
+ 鍏ㄩ儴鏀舵锛� <input type="radio" name='rdoReceiveQuannbu' id='rdoReceiveQuannbu0' value='0' checked="checked" onclick="QuannbuCheckedChanging(this)" /><label for='rdoReceiveQuannbu0'>鍏ㄩ儴鏀舵</label>
+ <input type="radio" name='rdoReceiveQuannbu' id='rdoReceiveQuannbu1' value='1' onclick="QuannbuCheckedChanging(this)" /><label for='rdoReceiveQuannbu1'>閮ㄥ垎鏀舵</label>
+
+ </td>
+ </tr>
+
+
+
+ <tr style='display: none;'>
+ <td colspan='3' class='col_third' id='td_toaccount' style='display: none;'>
+ 鏀舵璐︽埛锛�<select id='selAccounts' name='selAccounts' keepdefaultstyle='true'>
+ </select><br />
+ 绉戠洰(鍊�)锛�<select id='selSubjects' runat="server" datatextfield='SubjectName' datavaluefield='Keyid' keepdefaultstyle='true'>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td class='col_third' colspan='3'>
+ 鏀舵鏃ユ湡锛�<input class='date' id="txtReceiveDate" runat="server" maxlength='20' datefmt="yyyy-MM-dd HH:mm" style=" width:150px;"/>
+ </td>
+ </tr>
+ <tr>
+ <td class='col_third' colspan='3'>
+ 鏀舵澶囨敞锛�<textarea id='txtRemark' runat="server" onblur='Restrict(this,200)' rows="2" cols="50" class='remark' style='height: 50px; width: 70%;'></textarea>
+ </td>
+ </tr>
+ <tr>
+ <td class="contentLeft" colspan='3'>
+ 　　　　　<%--<input type="button" value="纭鏀舵" runat="server" id='btnSubmit' />--%>
+
+ <asp:Button ID="btn_Submit" Text="纭鏀舵" runat="server" OnClick="btn_Submit_form" OnClientClick="if(CheckStaff())return true;else return false; " />
+ <input type="hidden" id="ids" runat="server" />
+ </td>
+ </tr>
+ </table>
+
+ <table class="tableStyle" useclick="false" usecheckbox="true" sortmode="false" id="test_table" style="display:none;">
+ <thead>
+ <tr>
+ <th width="25">
+ </th>
+ <th width="25">
+ 缂栧彿
+ </th>
+ <th style="text-align: center;" width="70">
+ 璁㈠崟鍙�
+ </th>
+
+ <th style="text-align: center;">
+ 鍗颁欢鍚嶇О
+ </th>
+
+ <th width="60">
+ 閲戦
+ </th>
+ <th width="60">
+ 宸叉敹娆�
+ </th>
+ <th width="60">
+ 鏈粯娆�
+ </th>
+
+
+ </tr>
+ </thead>
+ <tbody>
+ <asp:repeater id="rptData" runat="server">
+ <itemtemplate>
+ <tr>
+ <td>
+ <input type="checkbox" name='ckId' value_keyid="<%#Eval("Keyid")%>" value="{
+ id:<%#Eval("Keyid")%>,
+ buyerId:'<%#Eval("BuyerId")%>',
+ orderId:'<%#Eval("SellerOrderId")%>',
+ orderType:<%#Eval("OrderTypeId")%>,
+ orderState:<%#Eval("OrderState")%>,
+ unPayedMoney:'<%#Eval("UnPayedMoney")%>',
+
+ PayState:<%#Eval("PayState")%>,
+
+ }" id='ckBox<%#Container.ItemIndex%>' class='ckBox' onclick="jisuanheji();" />
+ </td>
+ <td class="ItemIndex">
+ <%#Container.ItemIndex +1 /*(UCPager1.PageSize *( UCPager1.PageIndex-1)+1)*/%>
+ </td>
+ <td style="text-align: center;">
+
+ <%#Eval("SellerOrderId")%>
+
+ </td>
+ <td style="text-align: center;">
+
+ <%#Eval("DocumentName")%>
+
+ </td>
+
+
+ <td class="SumPrice">
+ <%#Eval("SumPrice", "{0:F}")%>
+ </td>
+
+ <td class="PayedMoney">
+ <%#Eval("TradingSingle.PayedMoney", "{0:F}")%>
+ </td>
+ <td class="UnPayedMoney">
+ <%#Eval("UnPayedMoney","{0:F}")%>
+ </td>
+
+ </tr>
+ </itemtemplate>
+ </asp:repeater>
+ </tbody>
+
+ <tr class="StatisticsMoney">
+ <td colspan="6" class="ali03" style="text-align:left;">
+ 閫変腑鍚堣锛�
+ </td>
+
+ <td class="ali01" >
+ <span id="NoMoney" runat="server" ></span>
+ </td>
+
+ </tr>
+ </table>
+ </form>
+</body>
+</html>
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/InvoicingShoukuan.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/InvoicingShoukuan.aspx.cs
new file mode 100644
index 0000000..0a36d14
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/InvoicingShoukuan.aspx.cs
@@ -0,0 +1,567 @@
+锘�/**
+* 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.financial
+{
+ public partial class InvoicingShoukuan : BasePage
+ {
+ private EC_OrderBasicBLL _eC_OrderBasicBLL = null;
+
+ private OA_CorporateClientsBLL bll_OA_CorporateClientsBLL = null;
+ OA_KaipiaoshenqingBLL oA_KaipiaoshenqingBLL = null;
+
+ /// <summary>
+ /// 鍒濆鍖栨瀯閫�
+ /// </summary>
+ public InvoicingShoukuan()
+ {
+ bll_OA_CorporateClientsBLL = new OA_CorporateClientsBLL();
+ oA_KaipiaoshenqingBLL = new OA_KaipiaoshenqingBLL();
+ _eC_OrderBasicBLL = new EC_OrderBasicBLL();
+ }
+ /// <summary>
+ /// 鐣岄潰鍔犺浇浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ //btnSubmit.ServerClick += new EventHandler(btnSubmit_ServerClick);
+ if (!IsPostBack)
+ {
+ LoadOrder();
+ }
+
+ if (IsPostBack || IsCallback)
+ return;
+ InitPage();
+
+ }
+
+ /// <summary>
+ /// 鎻愪氦鎸夐挳鐐瑰嚮浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ protected void btn_Submit_form(object sender, EventArgs e)
+ {
+ if (string.IsNullOrEmpty(this.txtReceiveMoney.Value) )
+ {
+ JavaScript.MessageBox("璇峰～鍐欐敹娆鹃噾棰�!", this);
+ return;
+ }
+
+ if (this.txtReceiveMoney.Value.ToDecimal2() <= 0 )
+ {
+ JavaScript.MessageBox("璇峰～鍐欐敹娆鹃噾棰�!", this);
+ return;
+ }
+
+ if (this.txtReceiveMoney.Value.ToDecimal2()> this.hidReceiveMoney.Value.ToDecimal2())
+ {
+ JavaScript.MessageBox("鏈鏀舵閲戦澶т簬璁㈠崟鏈粯娆�!", this);
+ return;
+ }
+
+
+
+ var id = Request["id"];
+ //string[] orderIds = Request["ids"].Split(',');
+ string receiveWay = Request["rdoReceiveWay"];
+
+ var ids = this.ids.Value;
+
+ bool isWin = false;
+ Dictionary<int, object> searchParam = new Dictionary<int, object>();
+
+ SetParamValue(searchParam, 1, CurrentUser.MemberId);
+ SetParamValue(searchParam, 2, "");
+ SetParamValue(searchParam, 3, "");
+ SetParamValue(searchParam, 4, "");
+ SetParamValue(searchParam, 5, "");
+ SetParamValue(searchParam, 6, "");
+ SetParamValue(searchParam, 7, "");
+ SetParamValue(searchParam, 8, "");
+ SetParamValue(searchParam, 9, "");
+ SetParamValue(searchParam, 10, "");
+ SetParamValue(searchParam, 11, "");
+ SetParamValue(searchParam, 12, "");
+ SetParamValue(searchParam, 13, "");
+ SetParamValue(searchParam, 14, "");
+ SetParamValue(searchParam, 15, "");
+ SetParamValue(searchParam, 16, "");
+ SetParamValue(searchParam, 18, 0);
+ SetParamValue(searchParam, 19, CurrentUser.TrueMemberId);
+ SetParamValue(searchParam, 20, CurrentUser.StaffId);
+ SetParamValue(searchParam, 21, CurrentUser.TrueName);
+ SetParamValue(searchParam, 22, "");
+ SetParamValue(searchParam, 23, "");
+ SetParamValue(searchParam, 24, "");
+ SetParamValue(searchParam, 25, "");
+ SetParamValue(searchParam, 26, id.ToGuid2());
+ SearchParam = searchParam;
+
+
+ /// UCPager1.AspNetPager.CurrentPageIndex = 1;//閲嶇疆椤垫暟
+ //鍐嶆鏌ヨ
+ // AspNetPager_PageChanged(UCPager1.AspNetPager, new EventArgs());
+ Infrastructure.Query.Pagination pagination = new Infrastructure.Query.Pagination()
+ {
+ PageSize = 1000,// UCPager1.AspNetPager.PageSize,
+ PageIndex = 1// UCPager1.AspNetPager.CurrentPageIndex
+ };
+ var _orderBasicmodes = _eC_OrderBasicBLL.SelectModelPage_Seller(pagination, SearchParam);//.Where(x=>x.Quchudingdan == 2);
+
+ var eC_OrderBasicsmeixuan = new List<EC_OrderBasic>();
+ decimal xuanzhongjine = 0;
+ if (Request["rdoReceiveQuannbu"] == "1")
+ {
+ var idxuan = ids.Trim(',').Split(',');
+ int?[] intArray = new int?[idxuan.Length];
+ for (int i = 0; i < idxuan.Length; i++)
+ {
+ intArray[i] = int.Parse(idxuan[i]);
+ }
+ var intArrayList = intArray.ToList();
+
+ //鏈�変腑鐨勮鍗�
+ eC_OrderBasicsmeixuan = _orderBasicmodes.Where(x => !intArrayList.Contains(x.Keyid)).ToList();
+ //閫変腑鐨勮鍗�
+ _orderBasicmodes = _orderBasicmodes.Where(x => intArrayList.Contains(x.Keyid)).ToList();
+
+
+ xuanzhongjine = _orderBasicmodes.Sum(x=>x.UnPayedMoney);
+
+ if (this.txtReceiveMoney.Value.ToDecimal2() < xuanzhongjine)
+ {
+ JavaScript.MessageBox("鏈鏀舵閲戦钀у畤閫変腑璁㈠崟鏈粯娆�!", this);
+ return;
+ }
+ }
+
+
+
+ using (var scope = new TransactionScope(TransactionScopeOption.Required,
+ new TransactionOptions
+ {
+ IsolationLevel = IsolationLevel.ReadCommitted,
+ Timeout = TransactionManager.MaximumTimeout
+ }
+ ))
+ {
+
+ try
+ {
+
+ //var _orderBasicmodes = _eC_OrderBasicBLL.GetOrderByIds(ids);
+ if (string.IsNullOrEmpty(id) || string.IsNullOrEmpty(receiveWay))
+ {
+ JavaScript.MessageBox("浼犲叆鍙傛暟閿欒锛�", this);
+ return;
+ }
+ if (null == _orderBasicmodes)
+ {
+ JavaScript.MessageBox("璁㈠崟涓嶅瓨鍦ㄦ垨宸插垹闄わ紒", this);
+ return;
+ }
+
+
+
+ int i = 0;
+ foreach (var _orderBasic in _orderBasicmodes)
+ {
+ if (_orderBasic.UnPayedMoney <= 0)
+ {
+ continue;
+ }
+
+ //EC_OrderBasic _orderBasic = _eC_OrderBasicBLL.SelectModelById(orderId.ToInt32().Value);
+
+ if (receiveWay == "0" && i == 0)
+ {
+ OA_CorporateClients m_OA_CorporateClients = bll_OA_CorporateClientsBLL.SelectModelByFirmIdandMemberId(CurrentUser.MemberId, _orderBasic.BuyerId);
+ if (m_OA_CorporateClients != null)
+ {
+ if (this.txtReceiveMoney.Value.ToDecimal2() > (m_OA_CorporateClients.Prepayments + m_OA_CorporateClients.Credit))
+ {
+ JavaScript.MessageBox("棰勪粯娆句笉瓒筹紒", this, "window.location='/Pages/financial/InvoicingShoukuan.aspx?id=" + Request["id"] + "'");
+ //Response.Redirect("/Pages/financial/OrderMoneyReceive.aspx?id=" + orderId);
+ return;
+ }
+ }
+ else
+ {
+ JavaScript.MessageBox("棰勪粯娆句笉瓒筹紒", this, "window.location='/Pages/financial/InvoicingShoukuan.aspx?id=" + Request["id"] + "'");
+ }
+
+
+ }
+ i = i + 1;
+
+ isWin = "0".Equals(receiveWay) ? UsePrepare(_orderBasic) : ToAccount(_orderBasic.Keyid.Value, _orderBasic.BuyerName, _orderBasic.UnPayedMoney);
+ if (!isWin)
+ {
+ JavaScript.MessageBox(_orderBasic.SellerOrderId + "鏀舵澶辫触锛�", this);
+ return;
+ //break;
+ }
+
+ }
+ if(Request["rdoReceiveQuannbu"] == "1" && this.txtReceiveMoney.Value.ToDecimal2() > xuanzhongjine)
+ {
+ var shengyujine = this.txtReceiveMoney.Value.ToDecimal2() - xuanzhongjine;
+ foreach (var _orderBasic in eC_OrderBasicsmeixuan)
+ {
+ if (_orderBasic.UnPayedMoney <= 0)
+ {
+ continue;
+ }
+ if (shengyujine <= 0)
+ {
+ break;
+ }
+
+ if(shengyujine<= _orderBasic.UnPayedMoney)
+ {
+ isWin = "0".Equals(receiveWay) ? UsePrepare(_orderBasic, shengyujine.Value) : ToAccount(_orderBasic.Keyid.Value, _orderBasic.BuyerName, shengyujine.Value);
+ shengyujine = 0;
+ }
+ else
+ {
+ isWin = "0".Equals(receiveWay) ? UsePrepare(_orderBasic) : ToAccount(_orderBasic.Keyid.Value, _orderBasic.BuyerName, _orderBasic.UnPayedMoney);
+ shengyujine = shengyujine-_orderBasic.UnPayedMoney;
+ }
+
+
+ if (!isWin)
+ {
+ JavaScript.MessageBox(_orderBasic.SellerOrderId + "鏀舵澶辫触锛�", this);
+ return;
+ //break;
+ }
+
+ }
+ }
+
+
+
+
+ scope.Complete();
+ }
+ catch (Exception ex)
+ {
+ // 鍥炴粴浜嬪姟
+ }
+ finally
+ {
+ // 閲婃斁璧勬簮
+ scope.Dispose();
+ }
+ }
+
+
+ if (isWin)
+ {
+ JavaScript.MessageBox("鎿嶄綔鎴愬姛", this);
+
+ JavaScript.RefreshDIVOpener(this);
+ }
+ else
+ {
+ JavaScript.MessageBox("鎿嶄綔澶辫触", this);
+ }
+
+
+
+ //JavaScript.MessageBox(isWin ? "鏀舵鎴愬姛锛�" : "鏀舵澶辫触锛�", this, "top.frmright.ReLoad();top.Dialog.close();");
+ //Request.RequestContext.RouteData.DataTokens.Add("IsWin", isWin ? "1" : "");
+ //if (!isWin)
+ // InitPage();
+ //else
+ // ;
+
+
+ }
+
+ /// <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();
+
+ //绉戠洰鍚嶇О
+ this.selSubjects.DataSource = _OA_SubjectSetBLL.getAllSubject(CurrentUser.MemberId, "鍊�");
+ this.selSubjects.DataBind();
+ this.selSubjects.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+
+ 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 a_Kaipiaoshenqing = oA_KaipiaoshenqingBLL.GetModelByKeyid(id.ToGuid2());
+ if (a_Kaipiaoshenqing != null)
+ {
+ var corporateClients = bll_OA_CorporateClientsBLL.GetModel(a_Kaipiaoshenqing.BuyerId);
+ if (corporateClients!=null)
+ {
+ this.txtBuyerName.Value = corporateClients.CompanyName;
+ }
+ this.txtFapiaohao.Value = a_Kaipiaoshenqing.Fapiaohao;
+ }
+
+
+
+ Dictionary<int, object> searchParam = new Dictionary<int, object>();
+
+ SetParamValue(searchParam, 1, CurrentUser.MemberId);
+ SetParamValue(searchParam, 2, "");
+ SetParamValue(searchParam, 3, "");
+ SetParamValue(searchParam, 4, "");
+ SetParamValue(searchParam, 5, "");
+ SetParamValue(searchParam, 6, "");
+ SetParamValue(searchParam, 7, "");
+ SetParamValue(searchParam, 8, "");
+ SetParamValue(searchParam, 9, "");
+ SetParamValue(searchParam, 10, "");
+ SetParamValue(searchParam, 11, "");
+ SetParamValue(searchParam, 12, "");
+ SetParamValue(searchParam, 13, "");
+ SetParamValue(searchParam, 14, "");
+ SetParamValue(searchParam, 15, "");
+ SetParamValue(searchParam, 16, "");
+ SetParamValue(searchParam, 18, 0);
+ SetParamValue(searchParam, 19, CurrentUser.TrueMemberId);
+ SetParamValue(searchParam, 20, CurrentUser.StaffId);
+ SetParamValue(searchParam, 21, CurrentUser.TrueName);
+ SetParamValue(searchParam, 22, "");
+ SetParamValue(searchParam, 23, "");
+ SetParamValue(searchParam, 24, "");
+ SetParamValue(searchParam, 25, "");
+ SetParamValue(searchParam, 26, id.ToGuid2());
+ SearchParam = searchParam;
+
+
+ /// UCPager1.AspNetPager.CurrentPageIndex = 1;//閲嶇疆椤垫暟
+ //鍐嶆鏌ヨ
+ // AspNetPager_PageChanged(UCPager1.AspNetPager, new EventArgs());
+ Infrastructure.Query.Pagination pagination = new Infrastructure.Query.Pagination()
+ {
+ PageSize = 1000,// UCPager1.AspNetPager.PageSize,
+ PageIndex = 1// UCPager1.AspNetPager.CurrentPageIndex
+ };
+ var _orderBasicmodes = _eC_OrderBasicBLL.SelectModelPage_Seller(pagination, SearchParam);//.Where(x=>x.Quchudingdan == 2);
+
+
+
+ //string[] orderIds = Request["id"];
+ // this.ids.Value = Request["id"];
+ //List<EC_OrderBasic> eC_OrderBasics = new List<EC_OrderBasic>();
+ decimal shoukuanmoney = 0;
+ decimal sumMoney = 0;
+ if (id == null || id.Length==0)
+ {
+ return;
+ }
+
+ try
+ {
+ //var _orderBasicmodes = _eC_OrderBasicBLL.GetOrderByIds(this.ids.Value);
+ foreach (var _orderBasicmode in _orderBasicmodes)
+ {
+ // EC_OrderBasic _orderBasicmode = _eC_OrderBasicBLL.SelectModelById(orderId.ToInt32().Value);
+ //OA_CorporateClients m_OA_CorporateClients = bll_OA_CorporateClientsBLL.SelectModelByFirmIdandMemberId(CurrentUser.MemberId, _orderBasicmode.BuyerId);
+ //if (m_OA_CorporateClients != null)
+ //{
+ // _orderBasicmode.nowCustomMoney = "锟�" + (m_OA_CorporateClients.Prepayments ?? 0).ToString("0.00");
+ // _orderBasicmode.nowCredit = "锟�" + (m_OA_CorporateClients.Credit ?? 0).ToString("0.00");
+ //}
+ //else
+ //{
+ // _orderBasicmode.nowCustomMoney = "锟�0";
+ // _orderBasicmode.nowCredit = "锟�0";
+ //}
+
+
+ sumMoney += (_orderBasicmode.SumPrice.HasValue? _orderBasicmode.SumPrice.Value:0);
+ shoukuanmoney += _orderBasicmode.UnPayedMoney;
+ // eC_OrderBasics.Add(_orderBasicmode);
+ }
+ this.txtReceiveMoney.Value = String.Format("{0:F}", shoukuanmoney);
+ this.txtSumMoney.Value = String.Format("{0:F}", sumMoney);
+ this.hidReceiveMoney.Value = String.Format("{0:F}", shoukuanmoney);
+ this.NoMoney.InnerText = "0";
+ rptData.DataSource = _orderBasicmodes;
+ rptData.DataBind();
+ }
+ catch (Exception ex)
+ {
+ PAGEHandleException(ex);
+ JavaScript.MessageBox("璁㈠崟涓嶅瓨鍦紒", this);
+ }
+
+
+ }
+
+ /// <summary>
+ /// 鏀舵鍒拌处鎴�
+ /// </summary>
+ /// <param name="orderId"></param>
+ /// <param name="buyerName"></param>
+ /// <returns></returns>
+ private bool ToAccount(int orderId, string buyerName,decimal UnPayedMoney)
+ {
+ OA_FirmAccountRecord oA_FirmAccountRecord = new Model.OA_FirmAccountRecord();
+ oA_FirmAccountRecord.Money = UnPayedMoney;
+ oA_FirmAccountRecord.LastUpdateTime = MyConvert.ConvertToDateTime(txtReceiveDate.Value);
+ if (!oA_FirmAccountRecord.Money.HasValue || 0 > oA_FirmAccountRecord.Money.Value)
+ {
+ return false;
+ }
+ if (!oA_FirmAccountRecord.LastUpdateTime.HasValue)
+ {
+ return false;
+ }
+
+ oA_FirmAccountRecord.Operator = CurrentUser.ShortName;
+ oA_FirmAccountRecord.Remark = txtRemark.Value;
+ oA_FirmAccountRecord.PaymentUnit = buyerName;
+ oA_FirmAccountRecord.SubjectId = MyConvert.ConvertToInt32(selSubjects.Value);
+ oA_FirmAccountRecord.AccountId = MyConvert.ConvertToInt32("0".Equals(Request["rdoReceiveWay"]) ? "0" : Request["selAccounts"]);
+ if (!oA_FirmAccountRecord.AccountId.HasValue || 0 == oA_FirmAccountRecord.AccountId.Value)
+ return false;
+ return _eC_OrderBasicBLL.ReceiveMoneyToAccount(orderId, oA_FirmAccountRecord);
+ }
+
+ /// <summary>
+ /// 浣跨敤棰勪粯娆�(浠樻銆佹敹娆�)
+ /// </summary>
+ /// <returns></returns>
+ private bool UsePrepare(EC_OrderBasic _orderBasic, decimal UnPayedMoney = 0)
+ {
+ decimal? money = _orderBasic.UnPayedMoney;
+ if(UnPayedMoney > 0)
+ {
+ money = UnPayedMoney;
+ }
+ int operatTypeId = 3;
+ string subject = "璁㈠崟浠樻";
+ switch (Request["outsourceType"])
+ {
+ case "1":
+ operatTypeId = 2;
+ subject = "澶栧崗浠樻";
+ break;
+ default:
+ break;
+ }
+ return _eC_OrderBasicBLL.ReceiveMoney(_orderBasic.SellerId, _orderBasic.BuyerId, _orderBasic.Keyid.Value, money.Value, operatTypeId, subject, CurrentUser.ShortName);
+ }
+
+
+ /// <summary>
+ /// 鏌ヨ鍙傛暟
+ /// </summary>
+ private Dictionary<int, object> SearchParam
+ {
+ get
+ {
+ return ViewState["SearchParam"] as Dictionary<int, object>;
+ }
+ set
+ {
+ ViewState["SearchParam"] = value;
+ }
+ }
+
+ /// <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);
+ }
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/InvoicingShoukuan.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/InvoicingShoukuan.aspx.designer.cs
new file mode 100644
index 0000000..e6d4177
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/InvoicingShoukuan.aspx.designer.cs
@@ -0,0 +1,143 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.financial
+{
+
+
+ public partial class InvoicingShoukuan
+ {
+
+ /// <summary>
+ /// CMSHead1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
+
+ /// <summary>
+ /// form1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+ /// <summary>
+ /// txtBuyerName 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtBuyerName;
+
+ /// <summary>
+ /// txtFapiaohao 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtFapiaohao;
+
+ /// <summary>
+ /// txtSumMoney 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtSumMoney;
+
+ /// <summary>
+ /// hidReceiveMoney 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputHidden hidReceiveMoney;
+
+ /// <summary>
+ /// txtReceiveMoney 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtReceiveMoney;
+
+ /// <summary>
+ /// selSubjects 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selSubjects;
+
+ /// <summary>
+ /// txtReceiveDate 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtReceiveDate;
+
+ /// <summary>
+ /// txtRemark 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlTextArea txtRemark;
+
+ /// <summary>
+ /// btn_Submit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button btn_Submit;
+
+ /// <summary>
+ /// ids 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputHidden ids;
+
+ /// <summary>
+ /// rptData 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Repeater rptData;
+
+ /// <summary>
+ /// NoMoney 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl NoMoney;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx
index d7cf6ae..4a4d5de 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx
@@ -37,6 +37,7 @@
<option value="7">鐢ㄨ溅</option>
<option value="10">涓氬姟缁忚垂</option>
<option value="11">瀹㈡埛鑱旇皧</option>
+<%-- <option value="13">寮�绁ㄧ敵璇�</option>--%>
<option value="12">鍏朵粬</option>
</select>
</td>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx.designer.cs
index 58e4063..54e0b41 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx.designer.cs
@@ -2,16 +2,18 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.work {
-
-
- public partial class MyRequestAdd {
-
+namespace CY.WebForm.Pages.work
+{
+
+
+ public partial class MyRequestAdd
+ {
+
/// <summary>
/// Head1 鎺т欢銆�
/// </summary>
@@ -20,7 +22,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
-
+
/// <summary>
/// CMSHead1 鎺т欢銆�
/// </summary>
@@ -29,7 +31,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
-
+
/// <summary>
/// form1 鎺т欢銆�
/// </summary>
@@ -38,7 +40,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-
+
/// <summary>
/// selPlanDataType 鎺т欢銆�
/// </summary>
@@ -47,7 +49,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selPlanDataType;
-
+
/// <summary>
/// txtPlanMoney 鎺т欢銆�
/// </summary>
@@ -56,7 +58,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtPlanMoney;
-
+
/// <summary>
/// txtPlanTitle 鎺т欢銆�
/// </summary>
@@ -65,7 +67,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtPlanTitle;
-
+
/// <summary>
/// selPlanTitle 鎺т欢銆�
/// </summary>
@@ -74,7 +76,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selPlanTitle;
-
+
/// <summary>
/// txtPlanContent 鎺т欢銆�
/// </summary>
@@ -83,7 +85,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlTextArea txtPlanContent;
-
+
/// <summary>
/// txtPlanRemark 鎺т欢銆�
/// </summary>
@@ -92,7 +94,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlTextArea txtPlanRemark;
-
+
/// <summary>
/// btn_submit 鎺т欢銆�
/// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestList.aspx
index f1547b2..ce046bd 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestList.aspx
@@ -83,6 +83,7 @@
<option value="7">鐢ㄨ溅</option>
<option value="10">涓氬姟缁忚垂</option>
<option value="11">瀹㈡埛鑱旇皧</option>
+ <option value="13">寮�绁ㄧ敵璇�</option>
<option value="12">鍏朵粬</option>
</select>
</td>
@@ -163,7 +164,7 @@
<ItemTemplate>
<tr>
<td>
- <input type="checkbox" value='<%#Eval("Keyid")%>' class='<%#(Eval("ApprovalStatus").ToString()=="1" || Eval("ApprovalStatus").ToString()=="3")?"AlreadyReply":""%>' />
+ <input type="checkbox" value='<%#Eval("Keyid")%>' class='<%#(Eval("ApprovalStatus").ToString()=="1" || Eval("ApprovalStatus").ToString()=="3" || Eval("PlanDataType").ToString()=="13")?"AlreadyReply":""%>' />
</td>
<td style="text-align: center">
<%#Container.ItemIndex + 1+ this.UCPager1.PageSize * (this.UCPager1.PageIndex - 1)%>
@@ -185,8 +186,8 @@
</td>
<td class="Operate " style="text-align: center">
<span menu_member_case_id="case_PlanView" menu_member_case_name="鏌ョ湅" onclick="onView('<%#Eval("Keyid")%>')">鏌ョ湅</span>
- <span menu_member_case_id="case_PlanEdit" menu_member_case_name="淇敼" onclick="onEdit('<%#Eval("Keyid")%>')" class='<%#(Eval("ApprovalStatus").ToString()=="1" || Eval("ApprovalStatus").ToString()=="3")?"AlreadyReply":""%>'>淇敼</span>
- <span menu_member_case_id="case_PlanDele" menu_member_case_name="鍒犻櫎" onclick="onDele('<%#Eval("Keyid")%>')" class='<%#(Eval("ApprovalStatus").ToString()=="1" || Eval("ApprovalStatus").ToString()=="3")?"AlreadyReply":""%>'>鍒犻櫎</span>
+ <span menu_member_case_id="case_PlanEdit" menu_member_case_name="淇敼" onclick="onEdit('<%#Eval("Keyid")%>')" class='<%#(Eval("ApprovalStatus").ToString()=="1" || Eval("ApprovalStatus").ToString()=="3" || Eval("PlanDataType").ToString()=="13" )?"AlreadyReply":""%>'>淇敼</span>
+ <span menu_member_case_id="case_PlanDele" menu_member_case_name="鍒犻櫎" onclick="onDele('<%#Eval("Keyid")%>')" class='<%#(Eval("ApprovalStatus").ToString()=="1" || Eval("ApprovalStatus").ToString()=="3" || Eval("PlanDataType").ToString()=="13" )?"AlreadyReply":""%>'>鍒犻櫎</span>
</td>
</tr>
</ItemTemplate>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestList.aspx.designer.cs
index 446b05d..92776db 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestList.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestList.aspx.designer.cs
@@ -2,16 +2,18 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.work {
-
-
- public partial class MyRequestList {
-
+namespace CY.WebForm.Pages.work
+{
+
+
+ public partial class MyRequestList
+ {
+
/// <summary>
/// Head1 鎺т欢銆�
/// </summary>
@@ -20,7 +22,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
-
+
/// <summary>
/// CMSHead1 鎺т欢銆�
/// </summary>
@@ -29,7 +31,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
-
+
/// <summary>
/// form1 鎺т欢銆�
/// </summary>
@@ -38,7 +40,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-
+
/// <summary>
/// txtRegTimeStart 鎺т欢銆�
/// </summary>
@@ -47,7 +49,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtRegTimeStart;
-
+
/// <summary>
/// txtRegTimeEnd 鎺т欢銆�
/// </summary>
@@ -56,7 +58,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtRegTimeEnd;
-
+
/// <summary>
/// selRemenderType 鎺т欢銆�
/// </summary>
@@ -65,7 +67,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selRemenderType;
-
+
/// <summary>
/// selPlanStatus 鎺т欢銆�
/// </summary>
@@ -74,7 +76,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selPlanStatus;
-
+
/// <summary>
/// selApprovalStatus 鎺т欢銆�
/// </summary>
@@ -83,7 +85,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selApprovalStatus;
-
+
/// <summary>
/// btn_Submit 鎺т欢銆�
/// </summary>
@@ -92,7 +94,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.Button btn_Submit;
-
+
/// <summary>
/// RepClientList 鎺т欢銆�
/// </summary>
@@ -101,7 +103,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.Repeater RepClientList;
-
+
/// <summary>
/// UCPager1 鎺т欢銆�
/// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs
index 0ad9efe..7d38946 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs
@@ -21,10 +21,13 @@
public partial class RequestReplyAdd : BasePage
{
OA_WorkPlanBll oA_WorkReminderBll = null;
-
+ OA_KaipiaoshenqingBLL _oA_KaipiaoshenqingBLL = null;
+ EC_OrderBLL _eC_OrderBLL = null;
public RequestReplyAdd()
{
oA_WorkReminderBll = new OA_WorkPlanBll();
+ _oA_KaipiaoshenqingBLL = new OA_KaipiaoshenqingBLL();
+ _eC_OrderBLL = new EC_OrderBLL();
}
//椤甸潰鍔犺浇
@@ -73,6 +76,25 @@
m_OA_WorkPlan.Operator = CurrentUser.ShortName;
m_OA_WorkPlan.LastUpdateTime = nowTime;
+ if (m_OA_WorkPlan.ApprovalStatus == 1 && m_OA_WorkPlan.PlanDataType == 13)
+ {//鎵瑰噯鍙嶅啓
+ var kaipiaoshenqing = _oA_KaipiaoshenqingBLL.GetModelByKeyid(m_OA_WorkPlan.PlanComplany.ToGuid2());
+ kaipiaoshenqing.ApprovalStatus = 1;
+ _oA_KaipiaoshenqingBLL.UpdateModel(kaipiaoshenqing);
+ }
+ else if (m_OA_WorkPlan.ApprovalStatus == 2 && m_OA_WorkPlan.PlanDataType == 13)
+ {
+ EC_OrderExtend model = new EC_OrderExtend();
+ //model.Keyid = idsArray[i].ToInt32();
+ model.KaipiaoshenqingCreater = null;
+ model.KaipiaoshenqingTime = null;
+ model.Kaipiaoshenqing = 2;
+ model.KaipiaoshenqingId = m_OA_WorkPlan.PlanComplany.ToGuid2();
+
+ _eC_OrderBLL.JujueKaipiaoshenqings(model);
+
+ }
+
if (Request["keyid"].ToInt32() > 0)
{
if (oA_WorkReminderBll.UpdateModel(m_OA_WorkPlan))
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx
index 9b22036..f33c8f7 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx
@@ -57,6 +57,7 @@
<option value="7">鐢ㄨ溅</option>
<option value="10">涓氬姟缁忚垂</option>
<option value="11">瀹㈡埛鑱旇皧</option>
+ <option value="13">寮�绁ㄧ敵璇�</option>
<option value="12">鍏朵粬</option>
</select>
</td>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx.designer.cs
index 131aac4..95ff9fd 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx.designer.cs
@@ -2,16 +2,18 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.work {
-
-
- public partial class RequestReplyList {
-
+namespace CY.WebForm.Pages.work
+{
+
+
+ public partial class RequestReplyList
+ {
+
/// <summary>
/// Head1 鎺т欢銆�
/// </summary>
@@ -20,7 +22,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
-
+
/// <summary>
/// CMSHead1 鎺т欢銆�
/// </summary>
@@ -29,7 +31,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
-
+
/// <summary>
/// form1 鎺т欢銆�
/// </summary>
@@ -38,7 +40,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-
+
/// <summary>
/// txtRegTimeStart 鎺т欢銆�
/// </summary>
@@ -47,7 +49,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtRegTimeStart;
-
+
/// <summary>
/// txtRegTimeEnd 鎺т欢銆�
/// </summary>
@@ -56,7 +58,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtRegTimeEnd;
-
+
/// <summary>
/// selRemenderType 鎺т欢銆�
/// </summary>
@@ -65,7 +67,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selRemenderType;
-
+
/// <summary>
/// selPlanStatus 鎺т欢銆�
/// </summary>
@@ -74,7 +76,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selPlanStatus;
-
+
/// <summary>
/// selApprovalStatus 鎺т欢銆�
/// </summary>
@@ -83,7 +85,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selApprovalStatus;
-
+
/// <summary>
/// btn_Submit 鎺т欢銆�
/// </summary>
@@ -92,7 +94,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.Button btn_Submit;
-
+
/// <summary>
/// RepClientList 鎺т欢銆�
/// </summary>
@@ -101,7 +103,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.Repeater RepClientList;
-
+
/// <summary>
/// UCPager1 鎺т欢銆�
/// </summary>
--
Gitblit v1.9.1