From e8e3122fdc4844202fb9e05477d47139e47a8aae Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 12 十二月 2025 08:59:47 +0800
Subject: [PATCH] 作业本送货变二级菜单
---
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPai.aspx.cs | 340 +++++
CY_ECommercePlatform/CY.BLL/CY.BLL.csproj | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiEdit.aspx | 91 +
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx.designer.cs | 116 +
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx | 230 +++
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx | 19
CY_ECommercePlatform/CY.SQLDAL/OA/CoreDeliverOrderItemDAL.cs | 215 +++
CY_ECommercePlatform/CY.IDAL/OA/ICoreCmsPlanOrderItemDAL.cs | 8
CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongEdit.aspx | 9
CY_ECommercePlatform/CY.Model/OA/OA_Gongzuoneirong.cs | 2
CY_ECommercePlatform/CY.BLL/OA/OA_KaipiaoshenqingBLL.cs | 5
CY_ECommercePlatform/CY.SQLDAL/OA/CoreDeliverOrderDAL.cs | 404 ++++++
CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingApplyPrint.aspx.cs | 2
CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuozhizeList.aspx | 16
CY_ECommercePlatform/CY.SQLDAL/OA/CoreCmsPlanOrderItemDAL.cs | 11
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx.cs | 99 +
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiDetail.aspx | 232 +++
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiDetail.aspx.designer.cs | 116 +
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiEdit.aspx.designer.cs | 71 +
CY_ECommercePlatform/AbstractFactory/Factory.cs | 15
CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx.designer.cs | 9
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPai.aspx.designer.cs | 71 +
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx | 216 +++
CY_ECommercePlatform/CY.IDAL/OA/ICoreDeliverOrderItemDAL.cs | 30
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiEdit.aspx.cs | 331 +++++
CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongList.aspx.cs | 27
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx.cs | 99 +
CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx.cs | 4
CY_ECommercePlatform/CY.Model/CY.Model.csproj | 1
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs | 4
CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingApply.aspx.cs | 2
CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongList.aspx | 22
CY_ECommercePlatform/CY.BLL/OA/CoreDeliverOrderBLL.cs | 256 +++
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiDetail.aspx.cs | 145 ++
CY_ECommercePlatform/CY.BLL/OA/CoreDeliverOrderItemBLL.cs | 127 +
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPai.aspx | 91 +
CY_ECommercePlatform/CY.Model/OA/CoreDeliverOrderItem.cs | 43
CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx | 13
CY_ECommercePlatform/CY.IDAL/OA/ICoreDeliverOrderDAL.cs | 43
CY_ECommercePlatform/CY.BLL/OA/CoreCmsPlanOrderItemBLL.cs | 12
CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj | 40
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx.designer.cs | 125 +
CY_ECommercePlatform/CY.SQLDAL/CY.SQLDAL.csproj | 2
CY_ECommercePlatform/CY.IDAL/CY.IDAL.csproj | 2
CY_ECommercePlatform/CY.SQLDAL/OA/OA_GongzuoneirongDAL.cs | 2
CY_ECommercePlatform/CY.Model/OA/CoreDeliverOrder.cs | 228 +++
47 files changed, 3,906 insertions(+), 44 deletions(-)
diff --git a/CY_ECommercePlatform/AbstractFactory/Factory.cs b/CY_ECommercePlatform/AbstractFactory/Factory.cs
index 94a1923..392c1a1 100644
--- a/CY_ECommercePlatform/AbstractFactory/Factory.cs
+++ b/CY_ECommercePlatform/AbstractFactory/Factory.cs
@@ -284,7 +284,9 @@
OBJECT_PATH.Add(DALInterface.ICoreCmsPlanOrderDAL, "CoreCmsPlanOrderDAL");
OBJECT_PATH.Add(DALInterface.ICoreCmsPlanOrderItemDAL, "CoreCmsPlanOrderItemDAL");
OBJECT_PATH.Add(DALInterface.IOA_YujihuikuanDAL, "OA_YujihuikuanDAL");
- OBJECT_PATH.Add(DALInterface.IOA_CuikuanjiluDAL, "OA_CuikuanjiluDAL");
+ OBJECT_PATH.Add(DALInterface.IOA_CuikuanjiluDAL, "OA_CuikuanjiluDAL");
+ OBJECT_PATH.Add(DALInterface.ICoreDeliverOrderItemDAL, "CoreDeliverOrderItemDAL");
+ OBJECT_PATH.Add(DALInterface.ICoreDeliverOrderDAL, "CoreDeliverOrderDAL");
#endregion
#region Pay
@@ -996,10 +998,19 @@
/// 宸ヤ綔鍐呭
/// </summary>
IOA_GongzuoneirongDAL = 1952,
-
/// <summary>
+ /// 宸ヤ綔鍐呭
+ /// </summary>
+ ICoreDeliverOrderItemDAL = 1953,
+
+ /// <summary>
+ /// 宸ヤ綔鍐呭
+ /// </summary>
+ ICoreDeliverOrderDAL = 1954,
+
+ /// <summary>
/// 寮�绁ㄧ敵璇�
/// </summary>
IOA_KaipiaonewDAL = 1932,
diff --git a/CY_ECommercePlatform/CY.BLL/CY.BLL.csproj b/CY_ECommercePlatform/CY.BLL/CY.BLL.csproj
index 1435e45..ec8d2af 100644
--- a/CY_ECommercePlatform/CY.BLL/CY.BLL.csproj
+++ b/CY_ECommercePlatform/CY.BLL/CY.BLL.csproj
@@ -158,6 +158,8 @@
<Compile Include="OA\CoreCmsPlanOrderBLL.cs" />
<Compile Include="OA\CoreCmsPlanOrderFahuoBLL.cs" />
<Compile Include="OA\CoreCmsPlanOrderItemBLL.cs" />
+ <Compile Include="OA\CoreDeliverOrderBLL.cs" />
+ <Compile Include="OA\CoreDeliverOrderItemBLL.cs" />
<Compile Include="OA\OA_BaozhengjinBLL.cs" />
<Compile Include="OA\OA_BaozhengjincuishouBLL.cs" />
<Compile Include="OA\OA_CarDictionaryBLL.cs" />
diff --git a/CY_ECommercePlatform/CY.BLL/OA/CoreCmsPlanOrderItemBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/CoreCmsPlanOrderItemBLL.cs
index 0b5e564..25f9bfe 100644
--- a/CY_ECommercePlatform/CY.BLL/OA/CoreCmsPlanOrderItemBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/OA/CoreCmsPlanOrderItemBLL.cs
@@ -113,6 +113,18 @@
/// <summary>
/// 鑾峰彇鍏ㄩ儴鍚堜綔瀹㈡埛
/// </summary>
+ /// <param name="orderkeyid">涓婚敭id</param>
+ /// <returns></returns>
+ public IEnumerable<CoreDeliverOrderItem> GetDeliverModelsByplanOrderid(int planorderkeyid)
+ {
+ Query query = new Query();
+ return _ICoreCmsPlanOrderItemDAL.GetDeliverModelsByplanOrderid(planorderkeyid);
+ }
+
+
+ /// <summary>
+ /// 鑾峰彇鍏ㄩ儴鍚堜綔瀹㈡埛
+ /// </summary>
/// <param name="Keyid">涓婚敭id</param>
/// <returns></returns>
public CoreCmsPlanOrderItem GetModelByKeyid(int keyid)
diff --git a/CY_ECommercePlatform/CY.BLL/OA/CoreDeliverOrderBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/CoreDeliverOrderBLL.cs
new file mode 100644
index 0000000..75da3cd
--- /dev/null
+++ b/CY_ECommercePlatform/CY.BLL/OA/CoreDeliverOrderBLL.cs
@@ -0,0 +1,256 @@
+锘縰sing 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 CoreDeliverOrderBLL
+ {
+ ICoreDeliverOrderDAL _ICoreDeliverOrderDAL = null;
+ OA_StaffBLL staffBLL = null;
+
+ /// <summary>
+ /// 鍒濆鍖栨瀯閫�
+ /// </summary>
+ public CoreDeliverOrderBLL()
+ {
+ //鑾峰彇CoreDeliverOrder DAL瀹炵幇
+ _ICoreDeliverOrderDAL = Factory.GetDALByInterfaceName(DALInterface.ICoreDeliverOrderDAL) as ICoreDeliverOrderDAL;
+ staffBLL = new OA_StaffBLL();
+
+
+ }
+
+ /// <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.CoreDeliverOrder m_CoreDeliverOrder)
+ {
+ try
+ {
+
+ return _ICoreDeliverOrderDAL.InserModel(m_CoreDeliverOrder);
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
+ /// <summary>
+ /// 鏂板閫佽揣瀹夋帓
+ /// </summary>
+ /// <param name="rType"></param>
+ /// <param name="m_OA_CustomerCommunications"></param>
+ /// <param name="m_EC_AcceptWayByCustomers"></param>
+ /// <returns></returns>
+ public int InsertModelIden(CY.Model.CoreDeliverOrder m_CoreDeliverOrder)
+ {
+ try
+ {
+
+ return _ICoreDeliverOrderDAL.InsertModelIden(m_CoreDeliverOrder);
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
+
+
+
+ /// <summary>
+ /// 淇敼閫佽揣瀹夋帓
+ /// </summary>
+ /// <param name="rType"></param>
+ /// <returns></returns>
+ public bool UpdateModel(CY.Model.CoreDeliverOrder m_CoreDeliverOrder)
+ {
+ try
+ {
+ return _ICoreDeliverOrderDAL.UpdateModel(m_CoreDeliverOrder);
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
+
+
+
+
+
+ /// <summary>
+ /// 鑾峰彇鍏ㄩ儴鍚堜綔瀹㈡埛
+ /// </summary>
+ /// <param name="Keyid">涓婚敭id</param>
+ /// <returns></returns>
+ public IEnumerable<CoreDeliverOrder> GetModelList()
+ {
+ Query query = new Query();
+ return _ICoreDeliverOrderDAL.SelectAllModel(query);
+ }
+
+
+ /// <summary>
+ /// 鏍规嵁formid鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ public IEnumerable<Model.CoreDeliverOrder> GetModelByformid(Guid formid)
+ {
+
+ return _ICoreDeliverOrderDAL.GetModelByformid(formid);
+ }
+
+
+ /// <summary>
+ /// 鏍规嵁formid鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ public IEnumerable<Model.CoreDeliverOrder> GetModelByorderid(int orderid)
+ {
+
+ return _ICoreDeliverOrderDAL.GetModelByorderid(orderid);
+ }
+
+
+ /// <summary>
+ /// 鑾峰彇鍏ㄩ儴鍚堜綔瀹㈡埛
+ /// </summary>
+ /// <param name="Keyid">涓婚敭id</param>
+ /// <returns></returns>
+ public CoreDeliverOrder GetModelByKeyid(string keyid)
+ {
+
+ return _ICoreDeliverOrderDAL.GetModelByKeyid(keyid);
+ }
+
+ /// <summary>
+ /// 鍒犻櫎鍚堜綔瀹㈡埛
+ /// </summary>
+ /// <param name="rType"></param>
+ /// <returns></returns>
+ public bool DeleteModel(CY.Model.CoreDeliverOrder rType)
+ {
+ try
+ {
+ _ICoreDeliverOrderDAL.DeleteModel(rType);
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ return true;
+ }
+
+ /// <summary>
+ /// 鏌ヨ鍚堜綔瀹㈡埛鍒嗛〉鍒楄〃
+ /// </summary>
+ /// <param name="pa"></param>
+ /// <returns></returns>
+ public IEnumerable<CoreDeliverOrder> SelectModelPage(Pagination pa, Guid FirmId, int? DriverId, string shipAddress,
+ string BuyerName, string createTimeStart, string createTimeEnd)
+ {
+ string Condition = " and b.FirmId ='" + FirmId + "' and a.OrderState = 0 ";
+ if (DriverId.HasValue)
+ {
+ var oA_Staff = staffBLL.GetModelByKeyid(DriverId);
+ Condition += " and ( a.DeliveryMoble = '" + oA_Staff.MobieNum + "' or a.DriverId = '" + DriverId + "' )";
+ }
+
+ if (!string.IsNullOrEmpty(shipAddress))
+ Condition += " and b.shipAddress = '" + shipAddress + "'";
+
+ if (!string.IsNullOrEmpty(BuyerName))
+ Condition += " and c.BuyerName like '%" + BuyerName + "%'";
+
+
+ if (!string.IsNullOrEmpty(createTimeStart))
+ Condition += " and DATEDIFF(day,a.[MakeTime],'" + createTimeStart + "')<=0 ";
+
+ if (!string.IsNullOrEmpty(createTimeEnd))
+ Condition += " and DATEDIFF(day,a.[MakeTime],'" + createTimeEnd + "')>=0 ";
+
+
+
+ Query query = new Query();
+ IList<Criterion> criterias = new List<Criterion>()
+ {
+ new Criterion("", Condition),
+
+ new Criterion("orderBy"," MakeTime desc ")
+ };
+ query.Criteria = criterias;
+ return _ICoreDeliverOrderDAL.SelectModelPage(query, pa);
+ }
+
+
+
+ /// <summary>
+ /// 鏌ヨ鍚堜綔瀹㈡埛鍒嗛〉鍒楄〃
+ /// </summary>
+ /// <param name="pa"></param>
+ /// <returns></returns>
+ public IEnumerable<CoreDeliverOrder> SelectModelPageLishi(Pagination pa, Guid FirmId, int? DriverId, string shipAddress,
+ string BuyerName, string createTimeStart, string createTimeEnd,string OrderState)
+ {
+ string Condition = " and b.FirmId ='" + FirmId + "' ";
+
+ if (!string.IsNullOrEmpty(OrderState))
+ {
+ Condition += " and a.OrderState = " + OrderState + " ";
+ }
+ else
+ {
+ Condition += " and a.OrderState in( 0,1,2 ) ";
+ }
+ if (DriverId.HasValue)
+ {
+ var oA_Staff = staffBLL.GetModelByKeyid(DriverId);
+ Condition += " and ( a.DeliveryMoble = '" + oA_Staff.MobieNum + "' or a.DriverId = '" + DriverId + "' )";
+ }
+
+ if (!string.IsNullOrEmpty(shipAddress))
+ Condition += " and b.shipAddress = '" + shipAddress + "'";
+
+ if (!string.IsNullOrEmpty(BuyerName))
+ Condition += " and c.BuyerName like '%" + BuyerName + "%'";
+
+
+ if (!string.IsNullOrEmpty(createTimeStart))
+ Condition += " and DATEDIFF(day,a.[MakeTime],'" + createTimeStart + "')<=0 ";
+
+ if (!string.IsNullOrEmpty(createTimeEnd))
+ Condition += " and DATEDIFF(day,a.[MakeTime],'" + createTimeEnd + "')>=0 ";
+
+
+
+ Query query = new Query();
+ IList<Criterion> criterias = new List<Criterion>()
+ {
+ new Criterion("", Condition),
+
+ new Criterion("orderBy"," MakeTime desc ")
+ };
+ query.Criteria = criterias;
+ return _ICoreDeliverOrderDAL.SelectModelPage(query, pa);
+ }
+
+
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.BLL/OA/CoreDeliverOrderItemBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/CoreDeliverOrderItemBLL.cs
new file mode 100644
index 0000000..8a67bd0
--- /dev/null
+++ b/CY_ECommercePlatform/CY.BLL/OA/CoreDeliverOrderItemBLL.cs
@@ -0,0 +1,127 @@
+锘縰sing 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 CoreDeliverOrderItemBLL
+ {
+ ICoreDeliverOrderItemDAL _ICoreDeliverOrderItemDAL = null;
+
+ /// <summary>
+ /// 鍒濆鍖栨瀯閫�
+ /// </summary>
+ public CoreDeliverOrderItemBLL()
+ {
+ //鑾峰彇CoreDeliverOrderItem DAL瀹炵幇
+ _ICoreDeliverOrderItemDAL = Factory.GetDALByInterfaceName(DALInterface.ICoreDeliverOrderItemDAL) as ICoreDeliverOrderItemDAL;
+
+
+ }
+
+ /// <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.CoreDeliverOrderItem m_CoreDeliverOrderItem)
+ {
+ try
+ {
+
+ return _ICoreDeliverOrderItemDAL.InserModel(m_CoreDeliverOrderItem);
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
+ /// <summary>
+ /// 淇敼閫佽揣瀹夋帓
+ /// </summary>
+ /// <param name="rType"></param>
+ /// <returns></returns>
+ public bool UpdateModel(CY.Model.CoreDeliverOrderItem m_CoreDeliverOrderItem)
+ {
+ try
+ {
+ return _ICoreDeliverOrderItemDAL.UpdateModel(m_CoreDeliverOrderItem);
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇鍏ㄩ儴鍚堜綔瀹㈡埛
+ /// </summary>
+ /// <param name="Keyid">涓婚敭id</param>
+ /// <returns></returns>
+ public IEnumerable<CoreDeliverOrderItem> GetModelList()
+ {
+ Query query = new Query();
+ return _ICoreDeliverOrderItemDAL.SelectAllModel(query);
+ }
+
+
+ /// <summary>
+ /// 鑾峰彇鍏ㄩ儴鍚堜綔瀹㈡埛
+ /// </summary>
+ /// <param name="orderid">涓婚敭id</param>
+ /// <returns></returns>
+ public IEnumerable<CoreDeliverOrderItem> GetModelsByOrderid(string orderid)
+ {
+ Query query = new Query();
+ return _ICoreDeliverOrderItemDAL.GetModelsByOrderid(orderid);
+ }
+
+
+
+
+
+
+ /// <summary>
+ /// 鑾峰彇鍏ㄩ儴鍚堜綔瀹㈡埛
+ /// </summary>
+ /// <param name="Keyid">涓婚敭id</param>
+ /// <returns></returns>
+ public CoreDeliverOrderItem GetModelByKeyid(int keyid)
+ {
+
+ return _ICoreDeliverOrderItemDAL.getCoreDeliverOrderItem(keyid);
+ }
+
+ /// <summary>
+ /// 鍒犻櫎鍚堜綔瀹㈡埛
+ /// </summary>
+ /// <param name="rType"></param>
+ /// <returns></returns>
+ public bool DeleteModel(CY.Model.CoreDeliverOrderItem rType)
+ {
+ try
+ {
+ _ICoreDeliverOrderItemDAL.DeleteModel(rType);
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ return true;
+ }
+
+
+
+
+}
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_KaipiaoshenqingBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_KaipiaoshenqingBLL.cs
index 818249d..e7ad82a 100644
--- a/CY_ECommercePlatform/CY.BLL/OA/OA_KaipiaoshenqingBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/OA/OA_KaipiaoshenqingBLL.cs
@@ -139,7 +139,7 @@
/// <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 PayStates, string HuikuanStates)
+ string Kaipiaoshenqing, string Kehuqianshou, string BusinessManagerId, string CustormerName, string PayStates, string HuikuanStates,string Fapiaohao)
{
string Condition = " and ok.FirmId ='" + FirmId + "' and ok.ApprovalStatus = 1 ";
@@ -179,7 +179,8 @@
Condition += " and ( ( ok.Shenqingleixing ='璁㈠崟寮�绁�' 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 ) ) or ( ok.Shenqingleixing ='棰勪粯娆惧紑绁�' and ok.[Kehumoney] < ok.[kpmoney] ) )";
}
}
-
+ if (!string.IsNullOrEmpty(Fapiaohao))
+ Condition += " and ok.Fapiaohao like '%" + Fapiaohao + "%'";
Query query = new Query();
IList<Criterion> criterias = new List<Criterion>()
diff --git a/CY_ECommercePlatform/CY.IDAL/CY.IDAL.csproj b/CY_ECommercePlatform/CY.IDAL/CY.IDAL.csproj
index f1c618f..3c75750 100644
--- a/CY_ECommercePlatform/CY.IDAL/CY.IDAL.csproj
+++ b/CY_ECommercePlatform/CY.IDAL/CY.IDAL.csproj
@@ -161,6 +161,8 @@
<Compile Include="OA\ICoreCmsPlanOrderDAL.cs" />
<Compile Include="OA\ICoreCmsPlanOrderFahuoDAL.cs" />
<Compile Include="OA\ICoreCmsPlanOrderItemDAL.cs" />
+ <Compile Include="OA\ICoreDeliverOrderDAL.cs" />
+ <Compile Include="OA\ICoreDeliverOrderItemDAL.cs" />
<Compile Include="OA\IOA_BaozhengjincuishouDAL.cs" />
<Compile Include="OA\IOA_BaozhengjinDAL.cs" />
<Compile Include="OA\IOA_CarrepairDAL.cs" />
diff --git a/CY_ECommercePlatform/CY.IDAL/OA/ICoreCmsPlanOrderItemDAL.cs b/CY_ECommercePlatform/CY.IDAL/OA/ICoreCmsPlanOrderItemDAL.cs
index a2267b7..3712199 100644
--- a/CY_ECommercePlatform/CY.IDAL/OA/ICoreCmsPlanOrderItemDAL.cs
+++ b/CY_ECommercePlatform/CY.IDAL/OA/ICoreCmsPlanOrderItemDAL.cs
@@ -41,5 +41,13 @@
/// <returns></returns>
IEnumerable<CoreDeliverOrderItem> GetDeliverModelsByZongOrderid(int orderkeyid);
+
+ /// <summary>
+ /// 鏍规嵁鎬籵rderid鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="orderkeyid">缂栧彿</param>
+ /// <returns></returns>
+ IEnumerable<CoreDeliverOrderItem> GetDeliverModelsByplanOrderid(int planorderkeyid);
+
}
}
diff --git a/CY_ECommercePlatform/CY.IDAL/OA/ICoreDeliverOrderDAL.cs b/CY_ECommercePlatform/CY.IDAL/OA/ICoreDeliverOrderDAL.cs
new file mode 100644
index 0000000..08ed75a
--- /dev/null
+++ b/CY_ECommercePlatform/CY.IDAL/OA/ICoreDeliverOrderDAL.cs
@@ -0,0 +1,43 @@
+锘縰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 ICoreDeliverOrderDAL : ICommonDAL, IPaging<CoreDeliverOrder>, IGetAllModel<CoreDeliverOrder>
+ {
+ /// <summary>
+ /// 鏍规嵁缂栧彿鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ CoreDeliverOrder GetModelByKeyid(string keyid);
+
+ /// <summary>
+ /// 鏍规嵁formid鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ IEnumerable<CoreDeliverOrder> GetModelByformid(Guid formid);
+
+ /// <summary>
+ /// 鏍规嵁orderid鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ IEnumerable<CoreDeliverOrder> GetModelByorderid(int orderid);
+
+ //澧炲姞瀹炰綋
+ int InsertModelIden(CY.Model.CoreDeliverOrder model);
+
+
+
+
+
+ }
+}
diff --git a/CY_ECommercePlatform/CY.IDAL/OA/ICoreDeliverOrderItemDAL.cs b/CY_ECommercePlatform/CY.IDAL/OA/ICoreDeliverOrderItemDAL.cs
new file mode 100644
index 0000000..fc44ab0
--- /dev/null
+++ b/CY_ECommercePlatform/CY.IDAL/OA/ICoreDeliverOrderItemDAL.cs
@@ -0,0 +1,30 @@
+锘縰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 ICoreDeliverOrderItemDAL : ICommonDAL, IPaging<CoreDeliverOrderItem>, IGetAllModel<CoreDeliverOrderItem>
+ {
+ /// <summary>
+ /// 鏍规嵁缂栧彿鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ CoreDeliverOrderItem getCoreDeliverOrderItem(int keyid);
+
+ /// <summary>
+ /// 鏍规嵁orderid鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ IEnumerable<CoreDeliverOrderItem> GetModelsByOrderid(string orderid);
+
+
+ }
+}
diff --git a/CY_ECommercePlatform/CY.Model/CY.Model.csproj b/CY_ECommercePlatform/CY.Model/CY.Model.csproj
index 1d619cf..57ea5dc 100644
--- a/CY_ECommercePlatform/CY.Model/CY.Model.csproj
+++ b/CY_ECommercePlatform/CY.Model/CY.Model.csproj
@@ -204,6 +204,7 @@
<Compile Include="OA\CoreCmsPlanOrder.cs" />
<Compile Include="OA\CoreCmsPlanOrderFahuo.cs" />
<Compile Include="OA\CoreCmsPlanOrderItem.cs" />
+ <Compile Include="OA\CoreDeliverOrder.cs" />
<Compile Include="OA\CoreDeliverOrderItem.cs" />
<Compile Include="OA\EC_OrderLiuyang.cs" />
<Compile Include="OA\OA_attachment.cs" />
diff --git a/CY_ECommercePlatform/CY.Model/OA/CoreDeliverOrder.cs b/CY_ECommercePlatform/CY.Model/OA/CoreDeliverOrder.cs
new file mode 100644
index 0000000..a661fd1
--- /dev/null
+++ b/CY_ECommercePlatform/CY.Model/OA/CoreDeliverOrder.cs
@@ -0,0 +1,228 @@
+锘縰sing System;
+using CY.Infrastructure.Domain;
+using CY.Infrastructure.Common;
+
+namespace CY.Model
+{
+ /// <summary>
+ /// 璁″垝璁㈠崟琛�
+ /// </summary>
+ [Serializable]
+ public partial class CoreDeliverOrder : IAggregateRoot
+ {
+ public CoreDeliverOrder()
+ {
+ }
+
+ #region Model
+
+ /// <summary>
+ /// 搴忓彿
+ /// </summary>
+ public Guid id { get; set; }
+ /// <summary>
+ /// 璁㈠崟ID 鍏宠仈order.id
+ /// </summary>
+ public int? OrderId { get; set; }
+
+ /// <summary>
+ /// 鍙告満鐢佃瘽
+ /// </summary>
+ public System.String DeliveryMoble { get; set; }
+
+ /// <summary>
+ ///鍙告満id
+ /// </summary>
+ public int? DriverId { get; set; }
+
+
+ public System.String CreateBy { get; set; }
+
+ public System.String UpDataBy { get; set; }
+
+ public DateTime? CreateTime { get; set; }
+
+ public DateTime? UpdataTime { get; set; }
+
+
+
+ public System.String ContactName { get; set; }
+
+ public System.String ContactPhone { get; set; }
+
+ public System.String pianqu { get; set; }
+ public System.String shipAddress { get; set; }
+ public System.String DriverName { get; set; }
+
+ public System.String BuyerName { get; set; }
+ public int OrderState { get; set; }
+
+
+ public string OrderStateName { get
+ {
+ if(OrderState == 0)
+ {
+ return "鏈��";
+ }
+ else if(OrderState == 1)
+ {
+ return "閰嶉�佷腑";
+ }
+ else if (OrderState == 2)
+ {
+ return "宸查��";
+ }
+ return "鏈��";
+
+ }
+ }
+
+ /// <summary>
+ /// 閫佽揣鏃堕棿
+ /// </summary>
+ public System.DateTime? MakeTime { get; set; }
+
+ /// <summary>
+ /// 閫佽揣鏃堕棿
+ /// </summary>
+ public System.DateTime? StartTime { get; set; }
+
+ /// <summary>
+ /// 閫佽揣鏃堕棿
+ /// </summary>
+ public System.DateTime? OverTime { get; set; }
+
+
+ public System.String Remarke { 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 ("id".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 1)
+ {
+ this.id = isChange ? MyConvert.ConvertToGuid(value) : id;
+ theValue = this.id;
+ }
+ else if ("OrderId".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 2)
+ {
+ this.OrderId = isChange ? MyConvert.ConvertToInt32(value) : OrderId;
+ theValue = this.OrderId;
+ }
+ else if ("DeliveryMoble".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 3)
+ {
+ this.DeliveryMoble = isChange ? MyConvert.ConvertToString(value) : DeliveryMoble;
+ theValue = this.DeliveryMoble;
+ }
+
+ else if ("MakeTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 8)
+ {
+ this.MakeTime = isChange ? MyConvert.ConvertToDateTime(value) : MakeTime;
+ theValue = this.MakeTime;
+ }
+ else if ("OrderState".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 9)
+ {
+ this.OrderState = isChange ? MyConvert.ConvertToInt32(value).Value : OrderState;
+ theValue = this.OrderState;
+ }
+
+ else if ("CreateBy".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 10)
+ {
+ this.CreateBy = isChange ? MyConvert.ConvertToString(value) : CreateBy;
+ theValue = this.CreateBy;
+ }
+ else if ("UpDataBy".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 11)
+ {
+ this.UpDataBy = isChange ? MyConvert.ConvertToString(value) : UpDataBy;
+ theValue = this.UpDataBy;
+ }
+ else if ("CreateTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 12)
+ {
+ this.CreateTime = isChange ? MyConvert.ConvertToDateTime(value) : CreateTime;
+ theValue = this.CreateTime;
+ }
+ else if ("UpdataTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 13)
+ {
+ this.UpdataTime = isChange ? MyConvert.ConvertToDateTime(value) : UpdataTime;
+ theValue = this.UpdataTime;
+ }
+
+ else if ("StartTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 14)
+ {
+ this.StartTime = isChange ? MyConvert.ConvertToDateTime(value) : StartTime;
+ theValue = this.StartTime;
+ }
+ else if ("OverTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 15)
+ {
+ this.OverTime = isChange ? MyConvert.ConvertToDateTime(value) : OverTime;
+ theValue = this.OverTime;
+ }
+
+ else if ("Remarke".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 16)
+ {
+ this.Remarke = isChange ? MyConvert.ConvertToString(value) : Remarke;
+ theValue = this.Remarke;
+ }
+
+ else if ("ContactName".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 17)
+ {
+ this.ContactName = isChange ? MyConvert.ConvertToString(value) : ContactName;
+ theValue = this.ContactName;
+ }
+
+ else if ("ContactPhone".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 18)
+ {
+ this.ContactPhone = isChange ? MyConvert.ConvertToString(value) : ContactPhone;
+ theValue = this.ContactPhone;
+ }
+
+ else if ("DriverId".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 19)
+ {
+ this.DriverId = isChange ? MyConvert.ConvertToInt32(value) : DriverId;
+ theValue = this.DriverId;
+ }
+ else if ("pianqu".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 20)
+ {
+ this.pianqu = isChange ? MyConvert.ConvertToString(value) : pianqu;
+ theValue = this.pianqu;
+ }
+ else if ("shipAddress".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 21)
+ {
+ this.shipAddress = isChange ? MyConvert.ConvertToString(value) : shipAddress;
+ theValue = this.shipAddress;
+ }
+ else if ("DriverName".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 22)
+ {
+ this.DriverName = isChange ? MyConvert.ConvertToString(value) : DriverName;
+ theValue = this.DriverName;
+ }
+ else if ("BuyerName".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 23)
+ {
+ this.BuyerName = isChange ? MyConvert.ConvertToString(value) : BuyerName;
+ theValue = this.BuyerName;
+ }
+
+ return theValue;
+ }
+
+ #endregion
+ }
+}
diff --git a/CY_ECommercePlatform/CY.Model/OA/CoreDeliverOrderItem.cs b/CY_ECommercePlatform/CY.Model/OA/CoreDeliverOrderItem.cs
index 7294030..6cc7d5f 100644
--- a/CY_ECommercePlatform/CY.Model/OA/CoreDeliverOrderItem.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/CoreDeliverOrderItem.cs
@@ -80,6 +80,27 @@
public System.DateTime? OverTime { get; set; }
+
+ public System.String CreateBy { get; set; }
+
+ public System.String UpDataBy { get; set; }
+
+ public DateTime? CreateTime { get; set; }
+
+ public DateTime? UpdataTime { get; set; }
+
+
+ /// <summary>
+ /// 閫佽揣鏁伴噺
+ /// </summary>
+ public System.Int32 DingdanNumber { get; set; }
+
+
+ /// <summary>
+ /// 閫佽揣鏁伴噺
+ /// </summary>
+ public System.Int32 WeisongNumber { get; set; }
+
#endregion Model
#region Visiter
@@ -146,6 +167,28 @@
}
+ else if ("CreateBy".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 10)
+ {
+ this.CreateBy = isChange ? MyConvert.ConvertToString(value) : CreateBy;
+ theValue = this.CreateBy;
+ }
+ else if ("UpDataBy".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 11)
+ {
+ this.UpDataBy = isChange ? MyConvert.ConvertToString(value) : UpDataBy;
+ theValue = this.UpDataBy;
+ }
+ else if ("CreateTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 12)
+ {
+ this.CreateTime = isChange ? MyConvert.ConvertToDateTime(value) : CreateTime;
+ theValue = this.CreateTime;
+ }
+ else if ("UpdataTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 13)
+ {
+ this.UpdataTime = isChange ? MyConvert.ConvertToDateTime(value) : UpdataTime;
+ theValue = this.UpdataTime;
+ }
+
+
return theValue;
}
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_Gongzuoneirong.cs b/CY_ECommercePlatform/CY.Model/OA/OA_Gongzuoneirong.cs
index c3f68f8..f8d2bec 100644
--- a/CY_ECommercePlatform/CY.Model/OA/OA_Gongzuoneirong.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_Gongzuoneirong.cs
@@ -26,6 +26,8 @@
public string ZerenrenName { get; set; }
+ public string DepartmentName { get; set; }
+
public DateTime? LastUpdateTime { get; set; }
diff --git a/CY_ECommercePlatform/CY.SQLDAL/CY.SQLDAL.csproj b/CY_ECommercePlatform/CY.SQLDAL/CY.SQLDAL.csproj
index abe96e2..79fb49e 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/CY.SQLDAL.csproj
+++ b/CY_ECommercePlatform/CY.SQLDAL/CY.SQLDAL.csproj
@@ -174,6 +174,8 @@
<Compile Include="OA\CoreCmsPlanOrderDAL.cs" />
<Compile Include="OA\CoreCmsPlanOrderFahuoDAL.cs" />
<Compile Include="OA\CoreCmsPlanOrderItemDAL.cs" />
+ <Compile Include="OA\CoreDeliverOrderDAL.cs" />
+ <Compile Include="OA\CoreDeliverOrderItemDAL.cs" />
<Compile Include="OA\OA_BaozhengjincuishouDAL.cs" />
<Compile Include="OA\OA_BaozhengjinDAL.cs" />
<Compile Include="OA\OA_CarDictionaryDAL.cs" />
diff --git a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
index 09528d4..37689ff 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
@@ -3134,7 +3134,7 @@
condition += " and a.CreateTime >= '" + StartCreatTime.Value + "' ";
if (EndCreatTime != null)
- condition += " and a.CreateTime =< '" + EndCreatTime.Value.AddDays(1) + "' ";
+ condition += " and a.CreateTime <= '" + EndCreatTime.Value.AddDays(1) + "' ";
if (StartReturnTime != null)
condition += " and d.DeliverTime >= '" + StartReturnTime.Value + "' ";
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/CoreCmsPlanOrderItemDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/CoreCmsPlanOrderItemDAL.cs
index 7d3fbc6..2b1fb4f 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/CoreCmsPlanOrderItemDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/CoreCmsPlanOrderItemDAL.cs
@@ -197,6 +197,17 @@
/// <summary>
+ /// 鍏ㄩ儴鏌ヨ
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.CoreDeliverOrderItem> GetDeliverModelsByplanOrderid(int planorderkeyid)
+ {
+ return _dataBase.SelectModel<Model.CoreDeliverOrderItem>(" a.*,b.[OrderId] as PlanOrderId,b.[MakeTime],b.[OrderState] ", " [CoreDeliverOrderItem] a Inner Join [CoreDeliverOrder] as b On(a.[OrderID]=b.[id] ) Inner Join [CoreCmsPlanOrder] as c On(b.[OrderID]=c.[id] ) ", " c.[id] = " + planorderkeyid + " and b.[OrderState] in (0,1) ") as IList<Model.CoreDeliverOrderItem>;//鎵ц鏌ヨ
+ }
+
+
+ /// <summary>
/// 鍒嗛〉鏌ヨ
/// </summary>
/// <param name="query"></param>
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/CoreDeliverOrderDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/CoreDeliverOrderDAL.cs
new file mode 100644
index 0000000..aeb309a
--- /dev/null
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/CoreDeliverOrderDAL.cs
@@ -0,0 +1,404 @@
+锘縰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 CoreDeliverOrderDAL : ICoreDeliverOrderDAL
+ {
+ private Database _dataBase = null;
+ #region 甯搁噺
+ /// <summary>
+ /// 鏌ヨ鐩爣
+ /// </summary>
+ const string SELECTTARGET = " t.* ";
+ /// <summary>
+ /// 鏌ヨ鏉ユ簮
+ /// </summary>
+ const string FROMSOUCEBEFORE = " ( select a.*,b.pianqu,b.shipAddress,c.BuyerName " +
+ " from [CoreDeliverOrder] a inner join CoreCmsPlanOrder b on a.OrderId = b.id inner join [EC_OrderBasic] c on b.orderkeyid = c.Keyid where 0=0 ";
+ const string FROMSOUCEEND = ") as t ";
+ /// <summary>
+ /// 鍒嗛〉榛樿鎺掑簭瀛楁
+ /// </summary>
+ const string ORDERBY = " MakeTime desc ";
+ #endregion
+ public CoreDeliverOrderDAL()
+ {
+ _dataBase = new Database();
+ }
+
+ /// <summary>
+ /// 鏂板
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public bool InserModel(Infrastructure.Domain.IAggregateRoot model)
+ {
+ Model.CoreDeliverOrder trueModel = model as Model.CoreDeliverOrder;
+ if (trueModel == null)
+ {
+ return false;
+ }
+
+ SqlParameter MakeTime = null;
+ if (trueModel.MakeTime.HasValue)
+ {
+ MakeTime = new SqlParameter("@MakeTime", trueModel.MakeTime.Value);
+ }
+ else
+ {
+ MakeTime = new SqlParameter("@MakeTime", DBNull.Value);
+ }
+
+ SqlParameter StartTime = null;
+ if (trueModel.StartTime.HasValue)
+ {
+ StartTime = new SqlParameter("@StartTime", trueModel.StartTime.Value);
+ }
+ else
+ {
+ StartTime = new SqlParameter("@StartTime", DBNull.Value);
+ }
+
+ SqlParameter OverTime = null;
+ if (trueModel.OverTime.HasValue)
+ {
+ OverTime = new SqlParameter("@OverTime", trueModel.OverTime.Value);
+ }
+ else
+ {
+ OverTime = new SqlParameter("@OverTime", DBNull.Value);
+ }
+
+
+ IList<SqlParameter> sqlParms = new List<SqlParameter>()
+ {
+ new SqlParameter("@id",trueModel.id),
+ new SqlParameter("@OrderId",trueModel.OrderId),
+ new SqlParameter("@DeliveryMoble",trueModel.DeliveryMoble),
+ new SqlParameter("@ContactName",string.IsNullOrEmpty(trueModel.ContactName)?"":trueModel.ContactName),
+ new SqlParameter("@ContactPhone",string.IsNullOrEmpty(trueModel.ContactPhone)?"":trueModel.ContactPhone),
+ new SqlParameter("@OrderState",trueModel.OrderState),
+ MakeTime,
+ StartTime,
+ OverTime,
+ new SqlParameter("@Remarke",string.IsNullOrEmpty(trueModel.Remarke)?"":trueModel.Remarke),
+ new SqlParameter("@DriverId",trueModel.DriverId.HasValue? trueModel.DriverId.Value:0),
+
+ new SqlParameter("@CreateTime",trueModel.CreateTime),
+
+ new SqlParameter("@CreateBy",trueModel.CreateBy),
+
+
+
+ };
+ string sql = "Insert Into CoreDeliverOrder ([id],[OrderId],[DeliveryMoble],[ContactName],[ContactPhone], [OrderState], [MakeTime],[StartTime], [OverTime],[Remarke], [DriverId],[CreateTime],[CreateBy] )"
+ + " Values (@id,@OrderId,@DeliveryMoble,@ContactName, @ContactPhone, @OrderState, @MakeTime, @StartTime, @OverTime, @Remarke, @DriverId,@CreateTime,@CreateBy )";
+ try
+ {
+ _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ return true;
+ }
+
+
+
+ /// <summary>
+ /// 鏂板
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public int InsertModelIden(CY.Model.CoreDeliverOrder trueModel)
+ {
+ //Model.CoreDeliverOrder trueModel = model as Model.CoreDeliverOrder;
+ if (trueModel == null)
+ {
+ return 0;
+ }
+ SqlParameter MakeTime = null;
+ if (trueModel.MakeTime.HasValue)
+ {
+ MakeTime = new SqlParameter("@MakeTime", trueModel.MakeTime.Value);
+ }
+ else
+ {
+ MakeTime = new SqlParameter("@MakeTime", DBNull.Value);
+ }
+
+ SqlParameter StartTime = null;
+ if (trueModel.StartTime.HasValue)
+ {
+ StartTime = new SqlParameter("@StartTime", trueModel.StartTime.Value);
+ }
+ else
+ {
+ StartTime = new SqlParameter("@StartTime", DBNull.Value);
+ }
+
+ SqlParameter OverTime = null;
+ if (trueModel.OverTime.HasValue)
+ {
+ OverTime = new SqlParameter("@OverTime", trueModel.OverTime.Value);
+ }
+ else
+ {
+ OverTime = new SqlParameter("@OverTime", DBNull.Value);
+ }
+
+ IList<SqlParameter> sqlParms = new List<SqlParameter>()
+ {
+ new SqlParameter("@id",trueModel.id),
+ new SqlParameter("@OrderId",trueModel.OrderId),
+ new SqlParameter("@DeliveryMoble",trueModel.DeliveryMoble),
+ new SqlParameter("@ContactName",string.IsNullOrEmpty(trueModel.ContactName)?"":trueModel.ContactName),
+ new SqlParameter("@ContactPhone",string.IsNullOrEmpty(trueModel.ContactPhone)?"":trueModel.ContactPhone),
+ new SqlParameter("@OrderState",trueModel.OrderState),
+ MakeTime,
+ StartTime,
+ OverTime,
+ new SqlParameter("@Remarke",string.IsNullOrEmpty(trueModel.Remarke)?"":trueModel.Remarke),
+ new SqlParameter("@DriverId",trueModel.DriverId.HasValue? trueModel.DriverId.Value:0),
+
+ new SqlParameter("@CreateTime",trueModel.CreateTime),
+
+ new SqlParameter("@CreateBy",trueModel.CreateBy),
+
+
+ };
+ string sql = "Insert Into CoreDeliverOrder ([id],[OrderId],[DeliveryMoble],[ContactName],[ContactPhone], [OrderState], [MakeTime],[StartTime], [OverTime],[Remarke], [DriverId],[CreateTime],[CreateBy] )"
+ + " Values (@id,@OrderId,@DeliveryMoble,@ContactName, @ContactPhone, @OrderState, @MakeTime, @StartTime, @OverTime, @Remarke, @DriverId,@CreateTime,@CreateBy )";
+
+ int id = 0;
+ try
+ {
+ id = _dataBase.InsertDataAndGetId(sql, sqlParms.ToArray<SqlParameter>());
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ return id;
+ }
+
+ /// <summary>
+ /// 淇敼
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public bool UpdateModel(Infrastructure.Domain.IAggregateRoot model)
+ {
+ Model.CoreDeliverOrder trueModel = model as Model.CoreDeliverOrder;
+ if (trueModel == null)
+ {
+ return false;
+ }
+
+ SqlParameter MakeTime = null;
+ if (trueModel.MakeTime.HasValue)
+ {
+ MakeTime = new SqlParameter("@MakeTime", trueModel.MakeTime.Value);
+ }
+ else
+ {
+ MakeTime = new SqlParameter("@MakeTime", DBNull.Value);
+ }
+
+ SqlParameter StartTime = null;
+ if (trueModel.StartTime.HasValue)
+ {
+ StartTime = new SqlParameter("@StartTime", trueModel.StartTime.Value);
+ }
+ else
+ {
+ StartTime = new SqlParameter("@StartTime", DBNull.Value);
+ }
+
+ SqlParameter OverTime = null;
+ if (trueModel.OverTime.HasValue)
+ {
+ OverTime = new SqlParameter("@OverTime", trueModel.OverTime.Value);
+ }
+ else
+ {
+ OverTime = new SqlParameter("@OverTime", DBNull.Value);
+ }
+ IList<SqlParameter> sqlParms = new List<SqlParameter>()
+ {
+ new SqlParameter("@id",trueModel.id),
+ new SqlParameter("@OrderId",trueModel.OrderId),
+ new SqlParameter("@DeliveryMoble",trueModel.DeliveryMoble),
+ new SqlParameter("@ContactName",string.IsNullOrEmpty(trueModel.ContactName)?"":trueModel.ContactName),
+ new SqlParameter("@ContactPhone",string.IsNullOrEmpty(trueModel.ContactPhone)?"":trueModel.ContactPhone),
+ new SqlParameter("@OrderState",trueModel.OrderState),
+ MakeTime,
+ StartTime,
+ OverTime,
+ new SqlParameter("@Remarke",string.IsNullOrEmpty(trueModel.Remarke)?"":trueModel.Remarke),
+ new SqlParameter("@DriverId",trueModel.DriverId.HasValue? trueModel.DriverId.Value:0),
+
+
+ new SqlParameter("@UpdataTime",trueModel.UpdataTime),
+
+ new SqlParameter("@UpDataBy",trueModel.UpDataBy),
+
+ };
+ string sql = "Update CoreDeliverOrder Set [OrderId]=@OrderId,[DeliveryMoble]=@DeliveryMoble,[ContactName]=@ContactName,[ContactPhone]=@ContactPhone, [OrderState]=@OrderState, [MakeTime]=@MakeTime,[StartTime]=@StartTime, [OverTime]=@OverTime,[Remarke]=@Remarke, [DriverId]=@DriverId,[UpdataTime]=@UpdataTime,[UpDataBy]=@UpDataBy where [id] =@id ";
+
+ try
+ {
+ _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ return true;
+ }
+
+ /// <summary>
+ /// 鏍规嵁缂栧彿鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ public CoreDeliverOrder GetModelByKeyid(string keyid)
+ {
+ try
+ {
+ string condition = " ";
+ if (!keyid.Equals(Guid.Empty))
+ {
+ condition = " id='" + keyid + "'";
+ }
+ else
+ {
+ return null;
+ }
+
+ // return null;//閿欒鏁版嵁杩斾細绌�
+
+ IList<CoreDeliverOrder> result = _dataBase.SelectModel<CoreDeliverOrder>("*", "CoreDeliverOrder", condition) as IList<CoreDeliverOrder>;//鎵ц鏌ヨ
+
+ 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.CoreDeliverOrder> SelectAllModel(Infrastructure.Query.Query query)
+ {
+ return _dataBase.SelectModel<Model.CoreDeliverOrder>(" * ", " CoreDeliverOrder ") as IList<Model.CoreDeliverOrder>;//鎵ц鏌ヨ
+ }
+
+ /// <summary>
+ /// 鍏ㄩ儴鏌ヨ
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.CoreDeliverOrder> GetModelByformid(Guid FirmId)
+ {
+ return _dataBase.SelectModel<Model.CoreDeliverOrder>(" * ", " CoreDeliverOrder ", " FirmId = '" + FirmId + "'") as IList<Model.CoreDeliverOrder>;//鎵ц鏌ヨ
+ }
+
+ /// <summary>
+ /// 鍏ㄩ儴鏌ヨ
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.CoreDeliverOrder> GetModelByorderid(int orderid)
+ {
+ return _dataBase.SelectModel<Model.CoreDeliverOrder>(" * ", " CoreDeliverOrder ", " OrderId = " + orderid + " order by MakeTime desc ") as IList<Model.CoreDeliverOrder>;//鎵ц鏌ヨ
+ }
+
+
+ /// <summary>
+ /// 鍏ㄩ儴鏌ヨ
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.CoreDeliverOrder> GetModelByids(string ids)
+ {
+ return _dataBase.SelectModel<Model.CoreDeliverOrder>(" * ", " CoreDeliverOrder ", " [id] in ( " + ids + ")") as IList<Model.CoreDeliverOrder>;//鎵ц鏌ヨ
+ }
+
+
+
+
+
+
+ /// <summary>
+ /// 鍒嗛〉鏌ヨ
+ /// </summary>
+ /// <param name="query"></param>
+ /// <param name="pagination"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.CoreDeliverOrder> 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.CoreDeliverOrder>(pagination, SELECTTARGET, fromSouce, orderbys[0], resultOrderBy);
+ }
+
+ /// <summary>
+ /// 鍒犻櫎
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public bool DeleteModel(Infrastructure.Domain.IAggregateRoot model)
+ {
+ Model.CoreDeliverOrder trueModel = model as Model.CoreDeliverOrder;
+ if (trueModel == null)
+ {
+ return false;
+ }
+ IList<SqlParameter> sqlParms = new List<SqlParameter>()
+ {
+ new SqlParameter("@Keyid",trueModel.id),
+ };
+ string sql = "Delete CoreDeliverOrder Where [id] = @Keyid;Delete [CoreDeliverOrderItem] Where [OrderID] = @Keyid; ";
+
+
+ try
+ {
+ _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ return true;
+ }
+ }
+}
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/CoreDeliverOrderItemDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/CoreDeliverOrderItemDAL.cs
new file mode 100644
index 0000000..531d1fe
--- /dev/null
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/CoreDeliverOrderItemDAL.cs
@@ -0,0 +1,215 @@
+锘縰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 CoreDeliverOrderItemDAL : ICoreDeliverOrderItemDAL
+ {
+ private Database _dataBase = null;
+ #region 甯搁噺
+ /// <summary>
+ /// 鏌ヨ鐩爣
+ /// </summary>
+ const string SELECTTARGET = " ";
+ /// <summary>
+ /// 鏌ヨ鏉ユ簮
+ /// </summary>
+ const string FROMSOUCEBEFORE = " ";
+ const string FROMSOUCEEND = " ";
+ /// <summary>
+ /// 鍒嗛〉榛樿鎺掑簭瀛楁
+ /// </summary>
+ const string ORDERBY = " SellerOrderId desc ";
+ #endregion
+ public CoreDeliverOrderItemDAL()
+ {
+ _dataBase = new Database();
+ }
+
+ /// <summary>
+ /// 鏂板
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public bool InserModel(Infrastructure.Domain.IAggregateRoot model)
+ {
+ Model.CoreDeliverOrderItem trueModel = model as Model.CoreDeliverOrderItem;
+ if (trueModel == null)
+ {
+ return false;
+ }
+
+
+
+ IList<SqlParameter> sqlParms = new List<SqlParameter>()
+ {
+ new SqlParameter("@id",trueModel.id),
+ new SqlParameter("@OrderID",trueModel.OrderID),
+ new SqlParameter("@ZYBName",trueModel.ZYBName),
+ new SqlParameter("@ZYBSpecification",trueModel.ZYBSpecification),
+ new SqlParameter("@Number",trueModel.Number),
+ new SqlParameter("@LessNumber",trueModel.LessNumber),
+ new SqlParameter("@CreateTime",trueModel.CreateTime),
+ new SqlParameter("@CreateBy",trueModel.CreateBy),
+
+
+ };
+ string sql = "Insert Into CoreDeliverOrderItem ([id],[OrderID],[ZYBName],[ZYBSpecification],[Number], [LessNumber], [CreateTime],[CreateBy] )"
+ + " Values (@id, @OrderID,@ZYBName,@ZYBSpecification, @Number, @LessNumber, @CreateTime,@CreateBy)";
+ 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.CoreDeliverOrderItem trueModel = model as Model.CoreDeliverOrderItem;
+ if (trueModel == null)
+ {
+ return false;
+ }
+
+
+ IList<SqlParameter> sqlParms = new List<SqlParameter>()
+ {
+
+ new SqlParameter("@id",trueModel.id),
+ new SqlParameter("@OrderID",trueModel.OrderID),
+ new SqlParameter("@ZYBName",trueModel.ZYBName),
+ new SqlParameter("@ZYBSpecification",trueModel.ZYBSpecification),
+ new SqlParameter("@Number",trueModel.Number),
+ new SqlParameter("@LessNumber",trueModel.LessNumber),
+ new SqlParameter("@UpdataTime",trueModel.UpdataTime),
+ new SqlParameter("@UpDataBy",trueModel.UpDataBy),
+
+ };
+ string sql = "Update CoreDeliverOrderItem Set [OrderID]=@OrderID,[ZYBName]=@ZYBName,[ZYBSpecification]=@ZYBSpecification,[Number]=@Number, [LessNumber]=@LessNumber , [UpdataTime]=@UpdataTime,[UpDataBy]=@UpDataBy where [id] =@id ";
+
+ try
+ {
+ _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ return true;
+ }
+
+ /// <summary>
+ /// 鏍规嵁缂栧彿鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ public CoreDeliverOrderItem getCoreDeliverOrderItem(int keyid)
+ {
+ try
+ {
+ string condition = " ";
+ if (!keyid.Equals(Guid.Empty))
+ {
+ condition = " id='" + keyid + "'";
+ }
+ else
+ {
+ return null;
+ }
+
+ // return null;//閿欒鏁版嵁杩斾細绌�
+
+ IList<CoreDeliverOrderItem> result = _dataBase.SelectModel<CoreDeliverOrderItem>("*", "CoreDeliverOrderItem", condition) as IList<CoreDeliverOrderItem>;//鎵ц鏌ヨ
+
+ 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.CoreDeliverOrderItem> SelectAllModel(Infrastructure.Query.Query query)
+ {
+ return _dataBase.SelectModel<Model.CoreDeliverOrderItem>(" * ", " CoreDeliverOrderItem ") as IList<Model.CoreDeliverOrderItem>;//鎵ц鏌ヨ
+ }
+
+ /// <summary>
+ /// 鍏ㄩ儴鏌ヨ
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.CoreDeliverOrderItem> GetModelsByOrderid(string orderid)
+ {
+ return _dataBase.SelectModel<Model.CoreDeliverOrderItem>(" * ", " CoreDeliverOrderItem ", " OrderID = '" + orderid + "' ") as IList<Model.CoreDeliverOrderItem>;//鎵ц鏌ヨ
+ }
+
+
+
+
+ /// <summary>
+ /// 鍒嗛〉鏌ヨ
+ /// </summary>
+ /// <param name="query"></param>
+ /// <param name="pagination"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.CoreDeliverOrderItem> SelectModelPage(Infrastructure.Query.Query query, Infrastructure.Query.Pagination pagination)
+ {
+
+ return null;
+ }
+
+ /// <summary>
+ /// 鍒犻櫎
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public bool DeleteModel(Infrastructure.Domain.IAggregateRoot model)
+ {
+ Model.CoreDeliverOrderItem trueModel = model as Model.CoreDeliverOrderItem;
+ if (trueModel == null)
+ {
+ return false;
+ }
+ IList<SqlParameter> sqlParms = new List<SqlParameter>()
+ {
+ new SqlParameter("@Keyid",trueModel.id)
+ };
+ string sql = "Delete CoreDeliverOrderItem Where [id] = @Keyid ";
+
+
+ try
+ {
+ _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ return true;
+ }
+ }
+}
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_GongzuoneirongDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_GongzuoneirongDAL.cs
index 857177f..ad089cc 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_GongzuoneirongDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_GongzuoneirongDAL.cs
@@ -246,7 +246,7 @@
{
try
{
- string where = " Zerenren = " + Zerenren + " and Gongzuozhize='"+ neirong + "'";
+ string where = " Zerenren = " + Zerenren /*+ " and Gongzuozhize='"+ neirong + "'"*/;
if (Keyid.HasValue)
{
diff --git a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
index e790a21..7287f35 100644
--- a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
+++ b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
@@ -1889,6 +1889,8 @@
<Content Include="Pages\business\Baozhengjinfukuan.aspx" />
<Content Include="Pages\business\BaozhengjinCuishou.aspx" />
<Content Include="Pages\business\DeliverPlanDakaList.aspx" />
+ <Content Include="Pages\business\DeliverWorkBookAnPaiEdit.aspx" />
+ <Content Include="Pages\business\DeliverWorkBookAnPai.aspx" />
<Content Include="Pages\business\DeliverPlanWentiOrder.aspx" />
<Content Include="Pages\business\DeliverPlanWentiAdd.aspx" />
<Content Include="Pages\business\DeliverPlanWentiEdit.aspx" />
@@ -1904,6 +1906,9 @@
<Content Include="Pages\business\DeliverPlanLishiPrint.aspx" />
<Content Include="Pages\business\DeliverPlanPaicheZhuyishixiang.aspx" />
<Content Include="Pages\business\DeliverPlanTimeEdit.aspx" />
+ <Content Include="Pages\business\DeliverWorkBookLiShiAnPaiList.aspx" />
+ <Content Include="Pages\business\DeliverWorkBookAnPaiList.aspx" />
+ <Content Include="Pages\business\DeliverWorkBookAnPaiDetail.aspx" />
<Content Include="Pages\business\DeliverWorkBookPandian.aspx" />
<Content Include="Pages\business\DeliverWorkBookFahuo.aspx" />
<Content Include="Pages\business\DeliverWorkBookfahuoqingkuang.aspx" />
@@ -3409,6 +3414,20 @@
<Compile Include="Pages\business\DeliverPlanDakaList.aspx.designer.cs">
<DependentUpon>DeliverPlanDakaList.aspx</DependentUpon>
</Compile>
+ <Compile Include="Pages\business\DeliverWorkBookAnPaiEdit.aspx.cs">
+ <DependentUpon>DeliverWorkBookAnPaiEdit.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\business\DeliverWorkBookAnPaiEdit.aspx.designer.cs">
+ <DependentUpon>DeliverWorkBookAnPaiEdit.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="Pages\business\DeliverWorkBookAnPai.aspx.cs">
+ <DependentUpon>DeliverWorkBookAnPai.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\business\DeliverWorkBookAnPai.aspx.designer.cs">
+ <DependentUpon>DeliverWorkBookAnPai.aspx</DependentUpon>
+ </Compile>
<Compile Include="Pages\business\DeliverPlanWentiOrder.aspx.cs">
<DependentUpon>DeliverPlanWentiOrder.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -3514,6 +3533,27 @@
<Compile Include="Pages\business\DeliverPlanTimeEdit.aspx.designer.cs">
<DependentUpon>DeliverPlanTimeEdit.aspx</DependentUpon>
</Compile>
+ <Compile Include="Pages\business\DeliverWorkBookLiShiAnPaiList.aspx.cs">
+ <DependentUpon>DeliverWorkBookLiShiAnPaiList.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\business\DeliverWorkBookLiShiAnPaiList.aspx.designer.cs">
+ <DependentUpon>DeliverWorkBookLiShiAnPaiList.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="Pages\business\DeliverWorkBookAnPaiList.aspx.cs">
+ <DependentUpon>DeliverWorkBookAnPaiList.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\business\DeliverWorkBookAnPaiList.aspx.designer.cs">
+ <DependentUpon>DeliverWorkBookAnPaiList.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="Pages\business\DeliverWorkBookAnPaiDetail.aspx.cs">
+ <DependentUpon>DeliverWorkBookAnPaiDetail.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\business\DeliverWorkBookAnPaiDetail.aspx.designer.cs">
+ <DependentUpon>DeliverWorkBookAnPaiDetail.aspx</DependentUpon>
+ </Compile>
<Compile Include="Pages\business\DeliverWorkBookPandian.aspx.cs">
<DependentUpon>DeliverWorkBookPandian.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPai.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPai.aspx
new file mode 100644
index 0000000..8a302ae
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPai.aspx
@@ -0,0 +1,91 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DeliverWorkBookAnPai.aspx.cs" Inherits="CY.WebForm.Pages.business.DeliverWorkBookAnPai" %>
+
+<!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" />
+ <!--鍓嶅彴椤甸潰start-->
+ <link rel="stylesheet" type="text/css" href="../../Styles/base.css" />
+ <link href="../../Styles/changes.css" rel="stylesheet" type="text/css" />
+ <link href="../../Styles/ParticularWQJ.css" rel="stylesheet" type="text/css" />
+ <!--鍓嶅彴椤甸潰end-->
+ <script type="text/javascript" language="javascript">
+
+
+
+
+
+
+
+
+
+
+ </script>
+
+</head>
+<body style='padding: 0; margin: 0;'>
+ <form id="form1" runat="server" style='padding: 0; margin: 0;' class='form2'>
+
+
+ <table class="table2" id="tbBasic">
+ <thead>
+ <tr>
+ <th colspan="8">
+ 鍩烘湰淇℃伅
+ </th>
+ </tr>
+ </thead>
+ <tr style=" height:1px;">
+ <td style="border:none;width: 100px;">
+ </td>
+ <td style="border:none; width:300px;">
+ </td>
+
+
+ </tr>
+ <tr>
+ <td class="ali03 ">
+ 鏃堕棿锛�
+ </td>
+ <td align="left">
+ <input id="txtDeliverTime" type="text" runat="server" class='date req' datefmt="yyyy-MM-dd HH:mm" maxlength='20' />
+ </td>
+ </tr>
+ <tr>
+ <td class="ali03 ">
+ 鍙告満锛�
+ </td>
+ <td align="left">
+
+ <select keepdefaultstyle='true' id='selCarId' runat="server" datatextfield='Name' datavaluefield='Keyid' class="Sreq">
+ </select>
+
+ </td>
+ </tr>
+
+
+
+ <tr>
+ <td class="contentLeft" colspan="2" style=" padding-left:300px;">
+ <asp:Button ID="btnSaves" runat="server" Text="鎻愪氦" OnClick="btnSave_ServerClick" />
+
+
+
+
+
+ </td>
+ </tr>
+ </table>
+
+
+
+ </form>
+
+</body>
+<script type="text/javascript" language="javascript">
+
+
+
+</script>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPai.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPai.aspx.cs
new file mode 100644
index 0000000..e9749c8
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPai.aspx.cs
@@ -0,0 +1,340 @@
+锘�/**
+* OrderEdit.aspx.cs
+*
+* 鍔� 鑳斤細 璁㈠崟鍒楄〃
+* 绫� 鍚嶏細 OrderEdit
+*
+* Ver 鍙樻洿鏃ユ湡 璐熻矗浜� 鍙樻洿鍐呭
+* 鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�
+* V0.01 2013-5-8 13:55 鍚村磶鍧� 鍒濈増
+* V0.02 2013-5-8 15:47 鍚村磶鍧� 瀹炵幇涓嬫媺鏁版嵁缁戝畾涓庢暟鎹骇鑱�
+* V0.03 2013-5-8 18:00 鍚村磶鍧� 鍒濇瀹屾垚鏂板绾夸笅璁㈠崟(鏈皟璇�)
+*
+*/
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using CY.BLL.Sys;
+using CY.BLL;
+using CY.Model;
+using CY.Infrastructure.Common;
+using CY.WebForm.Pages.common;
+using CY.BLL.EC;
+using CY.Model.Inquiry;
+using System.Transactions;
+
+namespace CY.WebForm.Pages.business
+{
+ public partial class DeliverWorkBookAnPai : BasePage
+ {
+
+ CoreCmsPlanOrderBLL _CoreCmsPlanOrderBLL = null;
+ CoreCmsPlanOrderItemBLL _CoreCmsPlanOrderItemBLL = null;
+ OA_StaffBLL bll_OA_StaffBLL = null;
+ OA_CarManageBll _OA_CarManageBll = null;
+ CoreDeliverOrderBLL _CoreDeliverOrderBLL = null;
+ CoreDeliverOrderItemBLL _CoreDeliverOrderItemBLL = null;
+
+ //鍒濆鍖�
+ public DeliverWorkBookAnPai()
+ {
+
+ _CoreCmsPlanOrderBLL = new CoreCmsPlanOrderBLL();
+ bll_OA_StaffBLL = new OA_StaffBLL();
+ _OA_CarManageBll = new OA_CarManageBll();
+ _CoreDeliverOrderBLL = new CoreDeliverOrderBLL();
+ _CoreDeliverOrderItemBLL = new CoreDeliverOrderItemBLL();
+ _CoreCmsPlanOrderItemBLL = new CoreCmsPlanOrderItemBLL();
+ }
+
+ /// <summary>
+ /// 椤甸潰鍔犺浇浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ try
+ {
+ switch (Request["Target"])
+ {
+ case "GetCommunication":
+ LoadCommunication();
+ break;
+ case "ReBindClients":
+ Response.Write(ReLoadClients());
+ break;
+
+ default:
+ Page_Load_Default();
+ return;
+ }
+ }
+ catch (Exception ex)
+ {
+ PAGEHandleException(ex);
+ Response.Clear();
+ //Response.Write("-1");
+ Response.Write(ex.Message);
+ }
+ Response.End();
+ }
+
+
+
+ /// <summary>
+ /// 榛樿鎵ц鏂规硶
+ /// </summary>
+ private void Page_Load_Default()
+ {
+
+
+
+ if (!IsPostBack && !IsCallback)
+ {
+
+
+
+
+
+
+ this.selCarId.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, false, false).Where(x => x.SM_Post == "鍙告満");
+ this.selCarId.DataTextField = "Name";
+ this.selCarId.DataValueField = "Keyid";
+ this.selCarId.DataBind();
+ this.selCarId.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+ DateTime now = DateTime.Now;
+ DateTime tomorrowMorning = now.AddDays(1).Date.Add(new TimeSpan(9, 0, 0)); // 9:00 AM
+
+
+ this.txtDeliverTime.Value = tomorrowMorning.ToString("yyyy-MM-dd HH:mm");
+
+ var ids = Request["ids"].ToString().Trim(',').Split(',');
+ for (int i = 0; i < ids.Length; i++)
+ {
+ var coreCmsPlanOrder = _CoreCmsPlanOrderBLL.GetModelByKeyid(ids[i].ToInt32().Value);
+
+ if (coreCmsPlanOrder.DeliverState.HasValue && coreCmsPlanOrder.DeliverState.Value == 2)
+ {
+ //鎿嶄綔鎴愬姛
+ JavaScript.MessageBox("宸茬粡閫佽揣瀹屾垚鐨勮鍒掕鍗曚笉鑳藉畨鎺�", this, true, false);
+ return;
+ }
+ var coreDeliverOrderItems = _CoreCmsPlanOrderItemBLL.GetDeliverModelsByplanOrderid(coreCmsPlanOrder.id).ToList();
+ if (coreDeliverOrderItems != null && coreDeliverOrderItems.Count > 0)
+ {
+ //鎿嶄綔鎴愬姛
+ JavaScript.MessageBox("宸叉湁鏈畬鎴愮殑閫佽揣瀹夋帓涓嶈兘瀹夋帓", this, true, false);
+ return;
+ }
+ }
+ }
+ }
+
+ /// <summary>
+ /// 淇濆瓨鐐瑰嚮浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ protected void btnSave_ServerClick(object sender, EventArgs e)
+ {
+
+ if (SaveOrder())
+ {
+ //鎿嶄綔鎴愬姛
+ JavaScript.MessageBoxCloseAndRefreshparent("鎿嶄綔鎴愬姛", this);
+ }
+ else
+ {
+ //鎿嶄綔澶辫触
+ JavaScript.MessageBox("鎿嶄綔澶辫触", this);
+ }
+ }
+
+
+
+
+
+ /// <summary>
+ /// 鍔犺浇瀹㈡埛鑱旂郴鏂瑰紡
+ /// </summary>
+ private void LoadCommunication()
+ {
+ Response.Clear();
+ string id = Request["id"];
+ if (string.IsNullOrEmpty(id))
+ {
+ Response.Write("-2");
+ return;
+ }
+
+ OA_CorporateClientsBLL _oA_CorporateClientsBLL = new OA_CorporateClientsBLL();
+ OA_CorporateClients m_OA_CorporateClients = _oA_CorporateClientsBLL.SelectModelByFirmIdandMemberId(CurrentUser.MemberId, id.ToGuid2());
+ OA_CustomerCommunications _oA_CustomerCommunications = _oA_CorporateClientsBLL.GetModel_CustomerCommunications(m_OA_CorporateClients.Keyid);
+ _oA_CustomerCommunications.DegreeImportanId = m_OA_CorporateClients.DegreeImportanId;
+ _oA_CustomerCommunications.AccountManagerId = m_OA_CorporateClients.AccountManagerId;
+ _oA_CustomerCommunications.BusinessManagerId = m_OA_CorporateClients.BusinessManagerId;
+ _oA_CustomerCommunications.CompanyName = m_OA_CorporateClients.CompanyName;
+ Response.Write(null == _oA_CustomerCommunications ? "" : JsonHelper.GetJsonStringByObject(_oA_CustomerCommunications));
+ }
+
+
+
+
+
+
+
+ /// <summary>
+ /// 淇濆瓨璁㈠崟
+ /// </summary>
+ private bool SaveOrder()
+ {
+
+
+ bool isWin = false;
+ using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required,
+ new TransactionOptions
+ {
+ IsolationLevel = System.Transactions.IsolationLevel.ReadCommitted,
+ Timeout = TransactionManager.MaximumTimeout
+ }
+ )
+ )
+ {
+ try
+ {
+
+ var ids = Request["ids"].ToString().Trim(',').Split(',');
+
+
+ var shijian = this.txtDeliverTime.Value.ToDateTime2();
+
+
+ var datenow = DateTime.Now;
+ var oA_Staff = bll_OA_StaffBLL.GetModelByKeyid(CurrentUser.StaffId);
+ foreach (var keyid in ids)
+ {
+ CoreDeliverOrder coreDeliverOrder = new CoreDeliverOrder();
+ coreDeliverOrder.id = Guid.NewGuid();
+ coreDeliverOrder.DriverId = this.selCarId.Value.ToInt32();
+ var i = 0;
+ var carManage = bll_OA_StaffBLL.GetModelByKeyid(this.selCarId.Value.ToInt32());
+ if (carManage != null)
+ {
+ coreDeliverOrder.DeliveryMoble = carManage.MobieNum;
+ }
+ coreDeliverOrder.OrderId = keyid.ToInt32();
+ coreDeliverOrder.CreateBy = oA_Staff.MobieNum;
+ coreDeliverOrder.CreateTime = datenow;
+
+ var coreCmsPlanOrder = _CoreCmsPlanOrderBLL.GetModelByKeyid(keyid.ToInt32().Value);
+ if (coreCmsPlanOrder != null)
+ {
+ coreDeliverOrder.ContactName = coreCmsPlanOrder.shipName;
+ coreDeliverOrder.ContactPhone = coreCmsPlanOrder.shipMobile;
+ }
+ coreDeliverOrder.OrderState = 0;
+ coreDeliverOrder.MakeTime = shijian;
+ coreDeliverOrder.Remarke = "";
+ isWin = _CoreDeliverOrderBLL.InsertModel(coreDeliverOrder);
+ var cmsPlanOrderItems =_CoreCmsPlanOrderItemBLL.GetModelsByOrderid(keyid.ToInt32().Value);
+ var coreDeliverOrderItems =_CoreCmsPlanOrderItemBLL.GetDeliverModelsByZongOrderid(coreCmsPlanOrder.orderkeyid.Value).Where(x => x.PlanOrderId == keyid.ToInt32().Value); ;
+ //閫佽揣鏁伴噺缁熻
+ var coreDeliverOrderItemsgroup = coreDeliverOrderItems.GroupBy(p => new { p.ZYBName, p.ZYBSpecification }) // 澶氫釜瀛楁浣滀负鍖垮悕绫诲瀷鍒嗙粍閿�
+ .Select(g => new CoreDeliverOrderItem
+ {
+ // 鍒嗙粍瀛楁
+ ZYBName = g.Key.ZYBName,
+ ZYBSpecification = g.Key.ZYBSpecification,
+ // 缁熻缁撴灉
+ //Count = g.Count(), // 姣忕粍浜烘暟
+ //AverageSalary = g.Average(p => p.Salary), // 骞冲潎宸ヨ祫
+ Number = g.Sum(p => p.Number), // 宸ヨ祫鎬诲拰
+ LessNumber = g.Sum(p => p.LessNumber)
+ }).ToList();
+ foreach ( var cmsPlanOrderItem in cmsPlanOrderItems)
+ {
+ var coreDeliverOrderItem1 = new CoreDeliverOrderItem();
+ coreDeliverOrderItem1.id = Guid.NewGuid();
+ coreDeliverOrderItem1.OrderID = coreDeliverOrder.id;
+ coreDeliverOrderItem1.ZYBName = cmsPlanOrderItem.name;
+ coreDeliverOrderItem1.ZYBSpecification = cmsPlanOrderItem.specification;
+ //闇�瑕佽绠楀凡缁忓彂璐х殑鏁伴噺
+ coreDeliverOrderItem1.Number = cmsPlanOrderItem.nums;
+ var coreDeliverOrderItem = coreDeliverOrderItemsgroup.FirstOrDefault(x => x.ZYBName == cmsPlanOrderItem.name && x.ZYBSpecification == cmsPlanOrderItem.specification);
+ if (coreDeliverOrderItem != null)
+ {
+
+ coreDeliverOrderItem1.Number = coreDeliverOrderItem1.Number - (coreDeliverOrderItem.Number + coreDeliverOrderItem.LessNumber);
+ if (coreDeliverOrderItem1.Number < 0)
+ {
+ coreDeliverOrderItem1.Number = 0;
+ }
+ }
+
+ coreDeliverOrderItem1.CreateBy = oA_Staff.MobieNum;
+ coreDeliverOrderItem1.CreateTime = datenow;
+ coreDeliverOrderItem1.LessNumber = 0;
+ isWin = _CoreDeliverOrderItemBLL.InsertModel(coreDeliverOrderItem1);
+ }
+ }
+
+
+ scope.Complete();
+ }
+ catch (Exception ex)
+ {
+
+ PAGEHandleException(ex);
+ JavaScript.MessageBox("鎿嶄綔澶辫触", this);
+ }
+ finally
+ {
+ // 閲婃斁璧勬簮
+ scope.Dispose();
+ }
+
+ }
+
+
+
+ return isWin;
+ }
+
+
+
+ /// <summary>
+ /// 閲嶆柊鍔犺浇瀹㈡埛鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ private string ReLoadClients()
+ {
+ try
+ {
+ string res = "<option value=''>璇烽�夋嫨</option>";
+ OA_CorporateClientsBLL bll_OA_CorporateClientsBLL = new OA_CorporateClientsBLL();
+ IList<OA_CorporateClients> m_OA_CorporateClientsList = bll_OA_CorporateClientsBLL.SelectListByFirmId(CurrentUser.MemberId) as IList<OA_CorporateClients>;
+ if (null != m_OA_CorporateClientsList)
+ {
+ m_OA_CorporateClientsList.Where(cc => CurrentUser.MemberId.Equals(cc.MemberId) && m_OA_CorporateClientsList.Remove(cc));
+ if (m_OA_CorporateClientsList.Count > 0)
+ {
+ foreach (var m_OA_CorporateClients in m_OA_CorporateClientsList)
+ {
+ res = res + ("<option value='" + m_OA_CorporateClients.MemberId + "'>" + m_OA_CorporateClients.CompanyName + "</option>");
+ }
+ }
+ }
+ return res;
+ }
+ catch (Exception ex)
+ {
+ PAGEHandleException(ex);
+ return "";
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPai.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPai.aspx.designer.cs
new file mode 100644
index 0000000..3a7e823
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPai.aspx.designer.cs
@@ -0,0 +1,71 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.business
+{
+
+
+ public partial class DeliverWorkBookAnPai
+ {
+
+ /// <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>
+ /// txtDeliverTime 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtDeliverTime;
+
+ /// <summary>
+ /// selCarId 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selCarId;
+
+ /// <summary>
+ /// btnSaves 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button btnSaves;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiDetail.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiDetail.aspx
new file mode 100644
index 0000000..3460bc1
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiDetail.aspx
@@ -0,0 +1,232 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DeliverWorkBookAnPaiDetail.aspx.cs" Inherits="CY.WebForm.Pages.business.DeliverWorkBookAnPaiDetail" %>
+
+<!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 type="text/javascript">
+ //杩濈珷
+ function onViewCarViolation(keyid) {
+ top.Dialog.open({ URL: "/Pages/business/CarViolationList.aspx?carid=" + keyid, Title: "杩濈珷绠＄悊", Width: 1000, Height: 660 });
+ }
+
+ //淇濆吇
+ function onViewCarMaintenance(keyid) {
+ top.Dialog.open({ URL: "/Pages/business/CarMaintenanceList.aspx?carid=" + keyid, Title: "淇濆吇绠＄悊", Width: 1000, Height: 660 });
+ }
+ //缁翠慨
+ function onViewCarrepair(keyid) {
+ top.Dialog.open({ URL: "/Pages/business/CarrepairList.aspx?carid=" + keyid, Title: "缁翠慨绠＄悊", Width: 1000, Height: 660 });
+ }
+
+ //骞存
+ function onViewCarExamined(keyid) {
+ top.Dialog.open({ URL: "/Pages/business/CarExaminedList.aspx?carid=" + keyid, Title: "骞存绠＄悊", Width: 1000, Height: 660 });
+ }
+
+ //淇濋櫓
+ function onViewCarInsurance(keyid) {
+ top.Dialog.open({ URL: "/Pages/business/CarInsuranceList.aspx?carid=" + keyid, Title: "淇濋櫓绠＄悊", Width: 1000, Height: 660 });
+ }
+
+ //淇敼
+ function onEdit(keyid) {
+ top.Dialog.open({ URL: "/Pages/business/CarManageAdd.aspx?keyid=" + keyid, Title: "杞﹁締淇℃伅", Width: 1000, Height: 660 });
+ }
+
+ //娣诲姞
+ function addModel() {
+ top.Dialog.open({ URL: "/Pages/business/CarManageAdd.aspx", Title: "鏂板杞﹁締", Width: 1000, Height: 660});
+ }
+
+ //鍒犻櫎
+ function onDele(keyid) {
+ top.Dialog.confirm("纭畾瑕佸垹闄よ璁板綍鍚楋紵", function () {
+ window.location = "/Pages/business/DeliverWorkBookAnPaiDetail.aspx?delete=" + keyid;
+ });
+ }
+
+ //鎵归噺鍒犻櫎
+ function onAllDelete() {
+ var deleteKeyIds = "";
+ $(":checkbox").each(
+ function () {
+ if ($(this).is(":checked")) {
+ deleteKeyIds += $(this).val() + ",";
+ }
+ }
+ )
+ if (deleteKeyIds == "") {
+ top.Dialog.alert("璇烽�夋嫨瑕佸垹闄ょ殑璁板綍", function () {
+ });
+ return;
+ }
+ else {
+ deleteKeyIds = deleteKeyIds.substring(0, deleteKeyIds.length - 1);
+ top.Dialog.confirm("纭畾瑕佸垹闄ゆ墍閫夎褰曞悧锛�", function () {
+ window.location = "/Pages/business/DeliverWorkBookAnPaiDetail.aspx?deleteKeyIds=" + deleteKeyIds;
+ });
+ }
+ }
+ $(function () {
+ $(".AlreadyReply").remove();
+ });
+ </script>
+ <style type="text/css">
+ .AlreadyReply { display: none; }
+ </style>
+</head>
+<body>
+ <form id="form1" runat="server">
+ <div id="scrollContent">
+ <div class="box1" paneltitle="鍔熻兘闈㈡澘" roller="false">
+ <table class="TableNewStyle">
+ <tr>
+
+ <td class="ali03">
+ 鐗囧尯锛�
+ </td>
+ <td>
+ <span id="spanpianqu" runat="server" ></span>
+
+ </td>
+
+ <td class="ali03">
+ 瀛︽牎锛�
+ </td>
+ <td>
+ <span id="spanxuexiao" runat="server" ></span>
+
+ </td>
+
+
+
+
+ </tr>
+ <tr>
+
+ <td class="ali03">
+ 鏀惰揣鍦板潃锛�
+ </td>
+ <td>
+ <span id="spanDizhi" runat="server" ></span>
+
+ </td>
+
+ <td class="ali03">
+ 鑱旂郴浜猴細
+ </td>
+ <td>
+ <span id="spanLianxiren" runat="server" ></span>
+
+ </td>
+
+
+
+
+ </tr>
+ <tr>
+
+ <td class="ali03">
+ 鑱旂郴鐢佃瘽锛�
+ </td>
+ <td>
+ <span id="spanDianhua" runat="server" ></span>
+
+ </td>
+
+ <td class="ali03">
+ 閫佽揣鏃堕棿锛�
+ </td>
+ <td>
+ <span id="spanShijian" runat="server" ></span>
+
+ </td>
+
+
+
+
+ </tr>
+ <tr>
+
+ <td class="ali03">
+ 鐘舵�侊細
+ </td>
+ <td>
+ <span id="spanZhuangtai" runat="server" ></span>
+
+ </td>
+
+ <td class="ali03">
+
+ </td>
+ <td>
+
+
+ </td>
+
+
+
+
+ </tr>
+ </table>
+ </div>
+
+ <div>
+ <asp:Repeater ID="RepClientList" runat="server">
+ <HeaderTemplate>
+ <table class="tableStyle">
+ <tr>
+ <th style="text-align: center">
+ 鍝佺
+ </th>
+ <th style="text-align: center">
+ 寰佽鏁伴噺
+ </th>
+
+ <th style="text-align: center">
+ 鏈�佹暟閲�
+ </th>
+ <th style="text-align: center">
+ 鏈閫佽揣鏁伴噺
+ </th>
+
+ <th style="text-align: center">
+ 鏈鑺傜害鏁伴噺
+ </th>
+
+ </tr>
+ </HeaderTemplate>
+ <ItemTemplate>
+ <tr>
+
+ <td style="text-align: center" >
+ <%#Eval("ZYBSpecification")%> <%#Eval("ZYBName")%>
+ </td>
+ <td style="text-align: center" >
+ <%#Eval("DingdanNumber")%>
+ </td>
+ <td style="text-align: center" >
+ <%#Eval("WeisongNumber")%>
+ </td>
+ <td style="text-align: center" >
+ <%#Eval("Number")%>
+ </td>
+ <td style="text-align: center" >
+ <%#Eval("LessNumber")%>
+ </td>
+
+ </tr>
+ </ItemTemplate>
+ <FooterTemplate>
+
+ </table>
+ </FooterTemplate>
+ </asp:Repeater>
+
+ </div>
+ </div>
+ </form>
+</body>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiDetail.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiDetail.aspx.cs
new file mode 100644
index 0000000..95b8278
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiDetail.aspx.cs
@@ -0,0 +1,145 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using CY.BLL;
+using CY.BLL.Sys;
+using CY.Model;
+using CY.Infrastructure.Query;
+using CY.Infrastructure.Common;
+using CY.BLL.EC;
+using CY.Model.Inquiry;
+
+namespace CY.WebForm.Pages.business
+{
+ //鍚磋緣
+ //琛屾斂绠＄悊
+ public partial class DeliverWorkBookAnPaiDetail : BasePage
+ {
+ CoreCmsPlanOrderBLL _CoreCmsPlanOrderBLL = null;
+ CoreCmsPlanOrderItemBLL _CoreCmsPlanOrderItemBLL = null;
+ OA_StaffBLL bll_OA_StaffBLL = null;
+ OA_CarManageBll _OA_CarManageBll = null;
+ CoreDeliverOrderBLL _CoreDeliverOrderBLL = null;
+ CoreDeliverOrderItemBLL _CoreDeliverOrderItemBLL = null;
+
+
+
+ //鍒濆鍖�
+ public DeliverWorkBookAnPaiDetail()
+ {
+ _CoreCmsPlanOrderBLL = new CoreCmsPlanOrderBLL();
+ bll_OA_StaffBLL = new OA_StaffBLL();
+ _OA_CarManageBll = new OA_CarManageBll();
+ _CoreDeliverOrderBLL = new CoreDeliverOrderBLL();
+ _CoreDeliverOrderItemBLL = new CoreDeliverOrderItemBLL();
+ _CoreCmsPlanOrderItemBLL = new CoreCmsPlanOrderItemBLL();
+ }
+
+ //椤甸潰鍔犺浇
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ if (!IsPostBack)
+ {
+
+
+ BindList();
+ }
+
+ }
+
+ //缁戝畾鏁版嵁
+ private void BindList()
+ {
+ string orderIdStr = Request["orderId"];
+
+
+ var coreDeliverOrder = _CoreDeliverOrderBLL.GetModelByKeyid(orderIdStr);
+ var coreCmsPlanOrder = _CoreCmsPlanOrderBLL.GetModelByKeyid(coreDeliverOrder.OrderId.Value);
+ var cmsPlanOrderItems = _CoreCmsPlanOrderItemBLL.GetModelsByOrderid(coreDeliverOrder.OrderId.Value);
+ var coreDeliverOrderItems = _CoreDeliverOrderItemBLL.GetModelsByOrderid(orderIdStr);
+
+
+
+ //宸茬粡閫佽揣鏁伴噺
+ var coreDeliverOrderItemssonghuo = _CoreCmsPlanOrderItemBLL.GetDeliverModelsByZongOrderid(coreCmsPlanOrder.orderkeyid.Value).Where(x=>x.PlanOrderId == coreCmsPlanOrder.id );
+
+
+
+
+
+
+
+
+
+
+
+ //閫佽揣鏁伴噺缁熻
+ var coreDeliverOrderItemsgroup = coreDeliverOrderItemssonghuo.GroupBy(p => new { p.ZYBName, p.ZYBSpecification }) // 澶氫釜瀛楁浣滀负鍖垮悕绫诲瀷鍒嗙粍閿�
+ .Select(g => new CoreDeliverOrderItem
+ {
+ // 鍒嗙粍瀛楁
+ ZYBName = g.Key.ZYBName,
+ ZYBSpecification = g.Key.ZYBSpecification,
+ // 缁熻缁撴灉
+ //Count = g.Count(), // 姣忕粍浜烘暟
+ //AverageSalary = g.Average(p => p.Salary), // 骞冲潎宸ヨ祫
+ Number = g.Sum(p => p.Number), // 宸ヨ祫鎬诲拰
+ LessNumber = g.Sum(p => p.LessNumber)
+ }).ToList();
+
+
+
+ this.spanpianqu.InnerText = coreCmsPlanOrder.pianqu;
+ this.spanxuexiao.InnerText = coreCmsPlanOrder.shipAddress;
+ this.spanDizhi.InnerText = coreCmsPlanOrder.shouhuoAddress;
+ this.spanLianxiren.InnerText = coreCmsPlanOrder.shipName;
+ this.spanDianhua.InnerText = coreCmsPlanOrder.shipMobile;
+ this.spanShijian.InnerText = coreDeliverOrder.MakeTime.Value.ToString("yyyy-MM-dd HH:mm:ss");
+ this.spanZhuangtai.InnerText = coreDeliverOrder.OrderStateName;
+
+
+
+ foreach (var coreDeliverOrderItem in coreDeliverOrderItems)
+ {
+ var deliverOrderItem = coreDeliverOrderItemsgroup.Where(x => x.ZYBName == coreDeliverOrderItem.ZYBName && x.ZYBSpecification == coreDeliverOrderItem.ZYBSpecification).FirstOrDefault();
+
+ var cmsPlanOrderItem = cmsPlanOrderItems.Where(x => x.name == coreDeliverOrderItem.ZYBName && x.specification == coreDeliverOrderItem.ZYBSpecification).FirstOrDefault();
+ if (cmsPlanOrderItem != null)
+ {
+ coreDeliverOrderItem.DingdanNumber = cmsPlanOrderItem.nums;
+ if (deliverOrderItem != null)
+ {
+ var weisong = cmsPlanOrderItem.nums - (deliverOrderItem.Number + deliverOrderItem.LessNumber);
+ coreDeliverOrderItem.WeisongNumber = (weisong > 0 ? weisong : 0);
+ }
+ else
+ {
+ coreDeliverOrderItem.WeisongNumber = cmsPlanOrderItem.nums ;
+ }
+ }
+
+
+
+
+ }
+
+
+
+
+
+ this.RepClientList.DataSource = coreDeliverOrderItems;
+ this.RepClientList.DataBind();
+
+ }
+
+
+
+
+
+
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiDetail.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiDetail.aspx.designer.cs
new file mode 100644
index 0000000..319977c
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiDetail.aspx.designer.cs
@@ -0,0 +1,116 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.business
+{
+
+
+ public partial class DeliverWorkBookAnPaiDetail
+ {
+
+ /// <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>
+ /// spanpianqu 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanpianqu;
+
+ /// <summary>
+ /// spanxuexiao 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanxuexiao;
+
+ /// <summary>
+ /// spanDizhi 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanDizhi;
+
+ /// <summary>
+ /// spanLianxiren 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanLianxiren;
+
+ /// <summary>
+ /// spanDianhua 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanDianhua;
+
+ /// <summary>
+ /// spanShijian 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanShijian;
+
+ /// <summary>
+ /// spanZhuangtai 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanZhuangtai;
+
+ /// <summary>
+ /// RepClientList 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Repeater RepClientList;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiEdit.aspx
new file mode 100644
index 0000000..aff763e
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiEdit.aspx
@@ -0,0 +1,91 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DeliverWorkBookAnPaiEdit.aspx.cs" Inherits="CY.WebForm.Pages.business.DeliverWorkBookAnPaiEdit" %>
+
+<!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" />
+ <!--鍓嶅彴椤甸潰start-->
+ <link rel="stylesheet" type="text/css" href="../../Styles/base.css" />
+ <link href="../../Styles/changes.css" rel="stylesheet" type="text/css" />
+ <link href="../../Styles/ParticularWQJ.css" rel="stylesheet" type="text/css" />
+ <!--鍓嶅彴椤甸潰end-->
+ <script type="text/javascript" language="javascript">
+
+
+
+
+
+
+
+
+
+
+ </script>
+
+</head>
+<body style='padding: 0; margin: 0;'>
+ <form id="form1" runat="server" style='padding: 0; margin: 0;' class='form2'>
+
+
+ <table class="table2" id="tbBasic">
+ <thead>
+ <tr>
+ <th colspan="8">
+ 鍩烘湰淇℃伅
+ </th>
+ </tr>
+ </thead>
+ <tr style=" height:1px;">
+ <td style="border:none;width: 100px;">
+ </td>
+ <td style="border:none; width:300px;">
+ </td>
+
+
+ </tr>
+ <tr>
+ <td class="ali03 ">
+ 鏃堕棿锛�
+ </td>
+ <td align="left">
+ <input id="txtDeliverTime" type="text" runat="server" class='date req' datefmt="yyyy-MM-dd HH:mm" maxlength='20' />
+ </td>
+ </tr>
+ <tr>
+ <td class="ali03 ">
+ 鍙告満锛�
+ </td>
+ <td align="left">
+
+ <select keepdefaultstyle='true' id='selCarId' runat="server" datatextfield='Name' datavaluefield='Keyid' class="Sreq">
+ </select>
+
+ </td>
+ </tr>
+
+
+
+ <tr>
+ <td class="contentLeft" colspan="2" style=" padding-left:300px;">
+ <asp:Button ID="btnSaves" runat="server" Text="鎻愪氦" OnClick="btnSave_ServerClick" />
+
+
+
+
+
+ </td>
+ </tr>
+ </table>
+
+
+
+ </form>
+
+</body>
+<script type="text/javascript" language="javascript">
+
+
+
+</script>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiEdit.aspx.cs
new file mode 100644
index 0000000..824177e
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiEdit.aspx.cs
@@ -0,0 +1,331 @@
+锘�/**
+* OrderEdit.aspx.cs
+*
+* 鍔� 鑳斤細 璁㈠崟鍒楄〃
+* 绫� 鍚嶏細 OrderEdit
+*
+* Ver 鍙樻洿鏃ユ湡 璐熻矗浜� 鍙樻洿鍐呭
+* 鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�
+* V0.01 2013-5-8 13:55 鍚村磶鍧� 鍒濈増
+* V0.02 2013-5-8 15:47 鍚村磶鍧� 瀹炵幇涓嬫媺鏁版嵁缁戝畾涓庢暟鎹骇鑱�
+* V0.03 2013-5-8 18:00 鍚村磶鍧� 鍒濇瀹屾垚鏂板绾夸笅璁㈠崟(鏈皟璇�)
+*
+*/
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using CY.BLL.Sys;
+using CY.BLL;
+using CY.Model;
+using CY.Infrastructure.Common;
+using CY.WebForm.Pages.common;
+using CY.BLL.EC;
+using CY.Model.Inquiry;
+using System.Transactions;
+
+namespace CY.WebForm.Pages.business
+{
+ public partial class DeliverWorkBookAnPaiEdit : BasePage
+ {
+
+ CoreCmsPlanOrderBLL _CoreCmsPlanOrderBLL = null;
+ CoreCmsPlanOrderItemBLL _CoreCmsPlanOrderItemBLL = null;
+ OA_StaffBLL bll_OA_StaffBLL = null;
+ OA_CarManageBll _OA_CarManageBll = null;
+ CoreDeliverOrderBLL _CoreDeliverOrderBLL = null;
+ CoreDeliverOrderItemBLL _CoreDeliverOrderItemBLL = null;
+
+ //鍒濆鍖�
+ public DeliverWorkBookAnPaiEdit()
+ {
+
+ _CoreCmsPlanOrderBLL = new CoreCmsPlanOrderBLL();
+ bll_OA_StaffBLL = new OA_StaffBLL();
+ _OA_CarManageBll = new OA_CarManageBll();
+ _CoreDeliverOrderBLL = new CoreDeliverOrderBLL();
+ _CoreDeliverOrderItemBLL = new CoreDeliverOrderItemBLL();
+ _CoreCmsPlanOrderItemBLL = new CoreCmsPlanOrderItemBLL();
+ }
+
+ /// <summary>
+ /// 椤甸潰鍔犺浇浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ try
+ {
+ switch (Request["Target"])
+ {
+ case "Chexiao":
+ LoadCommunication();
+ return;
+ case "ReBindClients":
+ Response.Write(ReLoadClients());
+ break;
+
+ default:
+ Page_Load_Default();
+ return;
+ }
+ }
+ catch (Exception ex)
+ {
+ PAGEHandleException(ex);
+ Response.Clear();
+ //Response.Write("-1");
+ Response.Write(ex.Message);
+ }
+ Response.End();
+ }
+
+
+
+ /// <summary>
+ /// 榛樿鎵ц鏂规硶
+ /// </summary>
+ private void Page_Load_Default()
+ {
+
+
+
+ if (!IsPostBack && !IsCallback)
+ {
+
+
+
+
+
+
+ this.selCarId.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, false, false).Where(x => x.SM_Post == "鍙告満");
+ this.selCarId.DataTextField = "Name";
+ this.selCarId.DataValueField = "Keyid";
+ this.selCarId.DataBind();
+ this.selCarId.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+
+
+ var orderId = Request["orderId"];
+ var coreDeliverOrder = _CoreDeliverOrderBLL.GetModelByKeyid(orderId);
+
+ if (coreDeliverOrder.OrderState != 0)
+ {
+ //鎿嶄綔鎴愬姛
+ JavaScript.MessageBox("宸茬粡寮�濮嬮�佽揣涓嶈兘瀹夋帓", this, true, false);
+ return;
+ }
+
+ if (coreDeliverOrder.DriverId.HasValue && coreDeliverOrder.DriverId.Value > 0)
+ {
+ var oA_Staff = bll_OA_StaffBLL.GetModelByKeyid(coreDeliverOrder.DriverId);
+ if (oA_Staff != null)
+ {
+ this.selCarId.Value = oA_Staff.Keyid.Value.ToString();
+ }
+ }
+ else
+ {
+ var oA_Staff = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId,false,false).Where(x=>x.MobieNum == coreDeliverOrder.DeliveryMoble).FirstOrDefault();
+ if (oA_Staff != null)
+ {
+ this.selCarId.Value = oA_Staff.Keyid.Value.ToString();
+ }
+ }
+ this.txtDeliverTime.Value = coreDeliverOrder.MakeTime.Value.ToString("yyyy-MM-dd HH:mm");
+
+
+
+
+
+
+
+
+ }
+ }
+
+ /// <summary>
+ /// 淇濆瓨鐐瑰嚮浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ protected void btnSave_ServerClick(object sender, EventArgs e)
+ {
+
+ if (SaveOrder())
+ {
+ //鎿嶄綔鎴愬姛
+ JavaScript.MessageBox("鎿嶄綔鎴愬姛", this,true,true);
+ }
+ else
+ {
+ //鎿嶄綔澶辫触
+ JavaScript.MessageBox("鎿嶄綔澶辫触", this);
+ }
+ }
+
+
+
+
+
+ /// <summary>
+ /// 鍔犺浇瀹㈡埛鑱旂郴鏂瑰紡
+ /// </summary>
+ private void LoadCommunication()
+ {
+ if (!IsPostBack && !IsCallback)
+ {
+
+
+
+
+
+
+
+
+
+ var orderId = Request["orderId"];
+ var coreDeliverOrder = _CoreDeliverOrderBLL.GetModelByKeyid(orderId);
+ if (coreDeliverOrder.OrderState != 0)
+ {
+ //鎿嶄綔鎴愬姛
+ JavaScript.MessageBox("宸茬粡寮�濮嬮�佽揣涓嶈兘鎾ら攢", this, true, false);
+ return;
+ }
+ coreDeliverOrder.OrderState = 5;
+ var oA_Staff = bll_OA_StaffBLL.GetModelByKeyid(CurrentUser.StaffId);
+ coreDeliverOrder.UpDataBy = string.IsNullOrEmpty(oA_Staff.MobieNum)?"": oA_Staff.MobieNum;
+ coreDeliverOrder.UpdataTime = DateTime.Now;
+ var sss = _CoreDeliverOrderBLL.UpdateModel(coreDeliverOrder);
+
+ //鎿嶄綔鎴愬姛
+ JavaScript.MessageBox("鎾ら攢鎴愬姛", this, true, true);
+ return;
+
+
+
+
+
+ }
+ }
+
+
+
+
+
+
+
+ /// <summary>
+ /// 淇濆瓨璁㈠崟
+ /// </summary>
+ private bool SaveOrder()
+ {
+
+
+ bool isWin = false;
+ using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required,
+ new TransactionOptions
+ {
+ IsolationLevel = System.Transactions.IsolationLevel.ReadCommitted,
+ Timeout = TransactionManager.MaximumTimeout
+ }
+ )
+ )
+ {
+ try
+ {
+
+ var orderId = Request["orderId"];
+ var coreDeliverOrder = _CoreDeliverOrderBLL.GetModelByKeyid(orderId);
+
+ var oA_Staff = bll_OA_StaffBLL.GetModelByKeyid(CurrentUser.StaffId);
+ var shijian = this.txtDeliverTime.Value.ToDateTime2();
+
+
+ var datenow = DateTime.Now;
+
+ // coreDeliverOrder.id = Guid.NewGuid();
+ coreDeliverOrder.DriverId = this.selCarId.Value.ToInt32();
+ var i = 0;
+ var carManage = bll_OA_StaffBLL.GetModelByKeyid(this.selCarId.Value.ToInt32());
+ if (carManage != null)
+ {
+ coreDeliverOrder.DeliveryMoble = carManage.MobieNum;
+ }
+ // coreDeliverOrder.OrderId = keyid.ToInt32();
+ coreDeliverOrder.UpDataBy = string.IsNullOrEmpty(oA_Staff.MobieNum) ? "" : oA_Staff.MobieNum;
+ coreDeliverOrder.UpdataTime = datenow;
+
+ var coreCmsPlanOrder = _CoreCmsPlanOrderBLL.GetModelByKeyid(coreDeliverOrder.OrderId.Value);
+ if (coreCmsPlanOrder != null)
+ {
+ coreDeliverOrder.ContactName = coreCmsPlanOrder.shipName;
+ coreDeliverOrder.ContactPhone = coreCmsPlanOrder.shipMobile;
+ }
+ coreDeliverOrder.OrderState = 0;
+ coreDeliverOrder.MakeTime = shijian;
+ coreDeliverOrder.Remarke = "";
+ isWin = _CoreDeliverOrderBLL.UpdateModel(coreDeliverOrder);
+
+
+
+
+
+
+ scope.Complete();
+ }
+ catch (Exception ex)
+ {
+
+ PAGEHandleException(ex);
+ JavaScript.MessageBox("鎿嶄綔澶辫触", this);
+ }
+ finally
+ {
+ // 閲婃斁璧勬簮
+ scope.Dispose();
+ }
+
+ }
+
+
+
+ return isWin;
+ }
+
+
+
+ /// <summary>
+ /// 閲嶆柊鍔犺浇瀹㈡埛鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ private string ReLoadClients()
+ {
+ try
+ {
+ string res = "<option value=''>璇烽�夋嫨</option>";
+ OA_CorporateClientsBLL bll_OA_CorporateClientsBLL = new OA_CorporateClientsBLL();
+ IList<OA_CorporateClients> m_OA_CorporateClientsList = bll_OA_CorporateClientsBLL.SelectListByFirmId(CurrentUser.MemberId) as IList<OA_CorporateClients>;
+ if (null != m_OA_CorporateClientsList)
+ {
+ m_OA_CorporateClientsList.Where(cc => CurrentUser.MemberId.Equals(cc.MemberId) && m_OA_CorporateClientsList.Remove(cc));
+ if (m_OA_CorporateClientsList.Count > 0)
+ {
+ foreach (var m_OA_CorporateClients in m_OA_CorporateClientsList)
+ {
+ res = res + ("<option value='" + m_OA_CorporateClients.MemberId + "'>" + m_OA_CorporateClients.CompanyName + "</option>");
+ }
+ }
+ }
+ return res;
+ }
+ catch (Exception ex)
+ {
+ PAGEHandleException(ex);
+ return "";
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiEdit.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiEdit.aspx.designer.cs
new file mode 100644
index 0000000..4ced488
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiEdit.aspx.designer.cs
@@ -0,0 +1,71 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.business
+{
+
+
+ public partial class DeliverWorkBookAnPaiEdit
+ {
+
+ /// <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>
+ /// txtDeliverTime 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtDeliverTime;
+
+ /// <summary>
+ /// selCarId 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selCarId;
+
+ /// <summary>
+ /// btnSaves 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button btnSaves;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx
new file mode 100644
index 0000000..6c68489
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx
@@ -0,0 +1,216 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DeliverWorkBookAnPaiList.aspx.cs" Inherits="CY.WebForm.Pages.business.DeliverWorkBookAnPaiList" %>
+
+<!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 type="text/javascript">
+ //杩濈珷
+ function onViewCarViolation(keyid) {
+ top.Dialog.open({ URL: "/Pages/business/CarViolationList.aspx?carid=" + keyid, Title: "杩濈珷绠＄悊", Width: 1000, Height: 660 });
+ }
+ //鏌ョ湅瀹㈡埛璧勬枡
+ function View(personId) {
+ top.Dialog.open({ URL: "/Pages/business/CorporateClientsDetail.aspx?keyid=" + personId, Title: "鏌ョ湅瀹㈡埛", Width: 900, Height: 580 });
+ }
+ //淇濆吇
+ function onViewCarMaintenance(keyid) {
+ top.Dialog.open({ URL: "/Pages/business/CarMaintenanceList.aspx?carid=" + keyid, Title: "淇濆吇绠＄悊", Width: 1000, Height: 660 });
+ }
+ //缁翠慨
+ function onViewCarrepair(keyid) {
+ top.Dialog.open({ URL: "/Pages/business/CarrepairList.aspx?carid=" + keyid, Title: "缁翠慨绠＄悊", Width: 1000, Height: 660 });
+ }
+
+ //骞存
+ function onViewCarExamined(keyid) {
+ top.Dialog.open({ URL: "/Pages/business/CarExaminedList.aspx?carid=" + keyid, Title: "骞存绠＄悊", Width: 1000, Height: 660 });
+ }
+
+ //鏌ョ湅鏄庣粏
+ function onViewCarInsurance(keyid) {
+ top.Dialog.open({ URL: "/Pages/business/DeliverWorkBookAnPaiDetail.aspx?orderId=" + keyid, Title: "鏌ョ湅鏄庣粏", Width: 900, Height: 900 });
+ }
+ //淇濋櫓
+ function onViewfahuo(keyid) {
+ top.Dialog.open({ URL: "/Pages/business/DeliverWorkBookfahuoqingkuang.aspx?orderId=" + keyid, Title: "鏌ョ湅鍙戣揣鎯呭喌", Width: 1800, Height: 900 });
+ }
+
+
+ //淇敼
+ function onEdit(keyid) {
+ top.Dialog.open({ URL: "/Pages/business/DeliverWorkBookAnPaiEdit.aspx?orderId=" + keyid, Title: "淇敼璁″垝", Width: 600, Height: 300 });
+ }
+ //鏂板鍙戣揣
+ function onViewXinzengsonghuo(keyid) {
+ top.Dialog.open({ URL: "/Pages/business/DeliverWorkBookFahuo.aspx?orderId=" + keyid, Title: "鏂板淇敼鍙戣揣", Width: 1500, Height: 900 });
+ }
+ //搴撳瓨鐩樼偣
+ function onViewKucunpandian(keyid) {
+ top.Dialog.open({ URL: "/Pages/business/DeliverWorkBookPandian.aspx?orderId=" + keyid, Title: "搴撳瓨鐩樼偣", Width: 1500, Height: 900 });
+ }
+
+ //娣诲姞
+ function addModel() {
+ top.Dialog.open({ URL: "/Pages/business/CarManageAdd.aspx", Title: "鏂板杞﹁締", Width: 1000, Height: 660});
+ }
+
+ //鍒犻櫎
+ function onDele(keyid) {
+
+ top.Dialog.confirm("纭畾瑕佹挙閿�璁板綍鍚楋紵", function () {
+ top.Dialog.open({ URL: "/Pages/business/DeliverWorkBookAnPaiEdit.aspx?Target=Chexiao&orderId=" + keyid, Title: "鎾ら攢璁″垝", Width: 600, Height: 300 });
+ });
+
+ }
+
+ //鎵归噺鍒犻櫎
+ function onAllDelete() {
+ var deleteKeyIds = "";
+ $(":checkbox").each(
+ function () {
+ if ($(this).is(":checked")) {
+ deleteKeyIds += $(this).val() + ",";
+ }
+ }
+ )
+ if (deleteKeyIds == "") {
+ top.Dialog.alert("璇烽�夋嫨瑕佸垹闄ょ殑璁板綍", function () {
+ });
+ return;
+ }
+ else {
+ deleteKeyIds = deleteKeyIds.substring(0, deleteKeyIds.length - 1);
+ top.Dialog.confirm("纭畾瑕佸垹闄ゆ墍閫夎褰曞悧锛�", function () {
+ window.location = "/Pages/business/DeliverWorkBookAnPaiList.aspx?deleteKeyIds=" + deleteKeyIds;
+ });
+ }
+ }
+ $(function () {
+ $(".AlreadyReply").remove();
+ });
+ </script>
+ <style type="text/css">
+ .AlreadyReply { display: none; }
+ </style>
+</head>
+<body>
+ <form id="form1" runat="server">
+ <div id="scrollContent">
+ <div class="box1" paneltitle="鍔熻兘闈㈡澘" roller="false">
+ <table class="TableNewStyle">
+ <tr>
+ <td class="ali03">
+ 瀹㈡埛鍚嶇О锛�
+ </td>
+ <td>
+ <input id='txtBuyerName' runat="server" maxlength='100' />
+ </td>
+ <td class="ali03">
+ 閫佽揣鏃堕棿锛�
+ </td>
+ <td style="width: 215px">
+ <input id="txtBeginDate" 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>
+ <select keepdefaultstyle='true' id='selDriver' runat="server" datatextfield='Name' datavaluefield='Keyid'>
+ </select>
+ </td>
+ <td class="ali03">
+ 瀛︽牎锛�
+ </td>
+ <td>
+ <input id='txtXuexiao' runat="server" maxlength='50' />
+ </td>
+
+
+ <td >
+ <asp:Button ID="btn_Submit" Text="鏌ヨ" runat="server" OnClick="btn_Search_Click" /> <input type="button" value='閲嶇疆' onclick='document.body.innerHTML="";window.location=window.location;' />
+ </td>
+ </tr>
+ </table>
+ </div>
+
+ <div>
+ <asp:Repeater ID="RepClientList" runat="server">
+ <HeaderTemplate>
+ <table class="tableStyle">
+ <tr>
+ <th width="30" style="text-align: center">
+ 缂栧彿
+ </th>
+ <th style="text-align: center">
+ 鏃ユ湡
+ </th>
+ <th style="text-align: center">
+ 瀹㈡埛鍚嶇О
+ </th>
+ <th style="text-align: center">
+ 鐗囧尯
+ </th>
+ <th style="text-align: center">
+ 瀛︽牎
+ </th>
+ <th style="text-align: center">
+ 鍙告満
+ </th>
+
+
+
+ <th style="text-align: center">
+ 鎿嶄綔
+ </th>
+ </tr>
+ </HeaderTemplate>
+ <ItemTemplate>
+ <tr>
+
+ <td style="text-align: center">
+ <%#Container.ItemIndex + 1+ this.UCPager1.PageSize * (this.UCPager1.PageIndex - 1)%>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("MakeTime", "{0:yyyy-MM-dd HH:mm}")%>
+ </td>
+
+ <td style="text-align: center">
+ <%#Eval("BuyerName")%>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("pianqu")%>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("shipAddress")%>
+ </td>
+
+ <td style="text-align: center">
+ <%#Eval("DriverName")%>
+ </td>
+
+ <td class="Operate " style="text-align: center">
+ <span onclick="onViewCarInsurance('<%#Eval("id")%>')">鏌ョ湅鏄庣粏</span>
+ <span menu_member_case_id="case_onEdit" menu_member_case_name="淇敼" onclick="onEdit('<%#Eval("id")%>')">淇敼</span>
+ <span menu_member_case_id="case_onDele" menu_member_case_name="鎾ら攢" onclick="onDele('<%#Eval("id")%>')">鎾ら攢</span>
+
+
+
+ </td>
+ </tr>
+ </ItemTemplate>
+ <FooterTemplate>
+ </table>
+ </FooterTemplate>
+ </asp:Repeater>
+ <div id="page">
+ <uc:UCPager ID="UCPager1" runat="server" />
+ </div>
+ </div>
+ </div>
+ </form>
+</body>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx.cs
new file mode 100644
index 0000000..055a8be
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx.cs
@@ -0,0 +1,99 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using CY.BLL;
+using CY.BLL.Sys;
+using CY.Model;
+using CY.Infrastructure.Query;
+using CY.Infrastructure.Common;
+using CY.BLL.EC;
+using CY.Model.Inquiry;
+
+namespace CY.WebForm.Pages.business
+{
+ //鍚磋緣
+ //琛屾斂绠＄悊
+ public partial class DeliverWorkBookAnPaiList : BasePage
+ {
+ CoreDeliverOrderBLL _CoreDeliverOrderBLL = null;
+ OA_StaffBLL bll_OA_StaffBLL = null;
+
+ //鍒濆鍖�
+ public DeliverWorkBookAnPaiList()
+ {
+
+ bll_OA_StaffBLL = new OA_StaffBLL();
+ _CoreDeliverOrderBLL = new CoreDeliverOrderBLL();
+ }
+
+ //椤甸潰鍔犺浇
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ UCPager1.AspNetPager.PageChanged += AspNetPager1_PageChanged;
+ if (!IsPostBack)
+ {
+ this.selDriver.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, false, false).Where(x => x.SM_Post == "鍙告満"); ;
+ this.selDriver.DataTextField = "Name";
+ this.selDriver.DataValueField = "Keyid";
+ this.selDriver.DataBind();
+ this.selDriver.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+
+
+
+
+
+ BindList();
+ }
+
+ }
+
+ //缁戝畾鏁版嵁
+ private void BindList()
+ {
+ Pagination pa = new Pagination();
+ pa.PageSize = UCPager1.AspNetPager.PageSize;
+ pa.PageIndex = UCPager1.AspNetPager.CurrentPageIndex;
+
+ var coreDeliverOrders = _CoreDeliverOrderBLL.SelectModelPage(pa, CurrentUser.MemberId, this.selDriver.Value.ToInt32(),this.txtXuexiao.Value.Trim(),this.txtBuyerName.Value.Trim(), this.txtBeginDate.Value.Trim(), this.txtEndDate.Value.Trim()); ;
+ foreach (var coreDeliverOrder in coreDeliverOrders)
+ {
+ if (coreDeliverOrder.DriverId.HasValue)
+ {
+ var oA_Staff = bll_OA_StaffBLL.GetModelByKeyid(coreDeliverOrder.DriverId);
+ if (oA_Staff != null)
+ {
+ coreDeliverOrder.DriverName = oA_Staff.Name;
+ }
+ }
+ else
+ {
+ var oA_Staff1 = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, false, false).Where(x => x.MobieNum == coreDeliverOrder.DeliveryMoble).FirstOrDefault();
+ if (oA_Staff1 != null)
+ {
+ coreDeliverOrder.DriverName = oA_Staff1.Name;
+ }
+ }
+
+ }
+
+ this.RepClientList.DataSource = coreDeliverOrders;
+ this.RepClientList.DataBind();
+ UCPager1.AspNetPager.RecordCount = pa.RecordCount;
+ }
+
+ //鍒嗛〉浜嬩欢
+ protected void AspNetPager1_PageChanged(object src, EventArgs e)
+ {
+ BindList();
+ }
+
+ //鏌ヨ浜嬩欢
+ protected void btn_Search_Click(object src, EventArgs e)
+ {
+ BindList();
+ }
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx.designer.cs
new file mode 100644
index 0000000..43854ed
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx.designer.cs
@@ -0,0 +1,116 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.business
+{
+
+
+ public partial class DeliverWorkBookAnPaiList
+ {
+
+ /// <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>
+ /// txtBuyerName 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtBuyerName;
+
+ /// <summary>
+ /// txtBeginDate 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtBeginDate;
+
+ /// <summary>
+ /// txtEndDate 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtEndDate;
+
+ /// <summary>
+ /// selDriver 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selDriver;
+
+ /// <summary>
+ /// txtXuexiao 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtXuexiao;
+
+ /// <summary>
+ /// btn_Submit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button btn_Submit;
+
+ /// <summary>
+ /// RepClientList 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Repeater RepClientList;
+
+ /// <summary>
+ /// UCPager1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::CY.WebForm.Pages.common.UCPager UCPager1;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx
new file mode 100644
index 0000000..47b01df
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx
@@ -0,0 +1,230 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DeliverWorkBookLiShiAnPaiList.aspx.cs" Inherits="CY.WebForm.Pages.business.DeliverWorkBookLiShiAnPaiList" %>
+
+<!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 type="text/javascript">
+ //杩濈珷
+ function onViewCarViolation(keyid) {
+ top.Dialog.open({ URL: "/Pages/business/CarViolationList.aspx?carid=" + keyid, Title: "杩濈珷绠＄悊", Width: 1000, Height: 660 });
+ }
+ //鏌ョ湅瀹㈡埛璧勬枡
+ function View(personId) {
+ top.Dialog.open({ URL: "/Pages/business/CorporateClientsDetail.aspx?keyid=" + personId, Title: "鏌ョ湅瀹㈡埛", Width: 900, Height: 580 });
+ }
+ //淇濆吇
+ function onViewCarMaintenance(keyid) {
+ top.Dialog.open({ URL: "/Pages/business/CarMaintenanceList.aspx?carid=" + keyid, Title: "淇濆吇绠＄悊", Width: 1000, Height: 660 });
+ }
+ //缁翠慨
+ function onViewCarrepair(keyid) {
+ top.Dialog.open({ URL: "/Pages/business/CarrepairList.aspx?carid=" + keyid, Title: "缁翠慨绠＄悊", Width: 1000, Height: 660 });
+ }
+
+ //骞存
+ function onViewCarExamined(keyid) {
+ top.Dialog.open({ URL: "/Pages/business/CarExaminedList.aspx?carid=" + keyid, Title: "骞存绠＄悊", Width: 1000, Height: 660 });
+ }
+
+ //鏌ョ湅鏄庣粏
+ function onViewCarInsurance(keyid) {
+ top.Dialog.open({ URL: "/Pages/business/DeliverWorkBookAnPaiDetail.aspx?orderId=" + keyid, Title: "鏌ョ湅鏄庣粏", Width: 900, Height: 900 });
+ }
+ //淇濋櫓
+ function onViewfahuo(keyid) {
+ top.Dialog.open({ URL: "/Pages/business/DeliverWorkBookfahuoqingkuang.aspx?orderId=" + keyid, Title: "鏌ョ湅鍙戣揣鎯呭喌", Width: 1800, Height: 900 });
+ }
+
+
+ //淇敼
+ function onEdit(keyid) {
+ top.Dialog.open({ URL: "/Pages/business/DeliverWorkBookAnPaiEdit.aspx?orderId=" + keyid, Title: "淇敼璁″垝", Width: 600, Height: 300 });
+ }
+ //鏂板鍙戣揣
+ function onViewXinzengsonghuo(keyid) {
+ top.Dialog.open({ URL: "/Pages/business/DeliverWorkBookFahuo.aspx?orderId=" + keyid, Title: "鏂板淇敼鍙戣揣", Width: 1500, Height: 900 });
+ }
+ //搴撳瓨鐩樼偣
+ function onViewKucunpandian(keyid) {
+ top.Dialog.open({ URL: "/Pages/business/DeliverWorkBookPandian.aspx?orderId=" + keyid, Title: "搴撳瓨鐩樼偣", Width: 1500, Height: 900 });
+ }
+
+ //娣诲姞
+ function addModel() {
+ top.Dialog.open({ URL: "/Pages/business/CarManageAdd.aspx", Title: "鏂板杞﹁締", Width: 1000, Height: 660});
+ }
+
+ //鍒犻櫎
+ function onDele(keyid) {
+
+ top.Dialog.confirm("纭畾瑕佹挙閿�璁板綍鍚楋紵", function () {
+ top.Dialog.open({ URL: "/Pages/business/DeliverWorkBookAnPaiEdit.aspx?Target=Chexiao&orderId=" + keyid, Title: "鎾ら攢璁″垝", Width: 600, Height: 300 });
+ });
+
+ }
+
+ //鎵归噺鍒犻櫎
+ function onAllDelete() {
+ var deleteKeyIds = "";
+ $(":checkbox").each(
+ function () {
+ if ($(this).is(":checked")) {
+ deleteKeyIds += $(this).val() + ",";
+ }
+ }
+ )
+ if (deleteKeyIds == "") {
+ top.Dialog.alert("璇烽�夋嫨瑕佸垹闄ょ殑璁板綍", function () {
+ });
+ return;
+ }
+ else {
+ deleteKeyIds = deleteKeyIds.substring(0, deleteKeyIds.length - 1);
+ top.Dialog.confirm("纭畾瑕佸垹闄ゆ墍閫夎褰曞悧锛�", function () {
+ window.location = "/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx?deleteKeyIds=" + deleteKeyIds;
+ });
+ }
+ }
+ $(function () {
+ $(".AlreadyReply").remove();
+ });
+ </script>
+ <style type="text/css">
+ .AlreadyReply { display: none; }
+ </style>
+</head>
+<body>
+ <form id="form1" runat="server">
+ <div id="scrollContent">
+ <div class="box1" paneltitle="鍔熻兘闈㈡澘" roller="false">
+ <table class="TableNewStyle">
+ <tr>
+ <td class="ali03">
+ 瀹㈡埛鍚嶇О锛�
+ </td>
+ <td>
+ <input id='txtBuyerName' runat="server" maxlength='100' />
+ </td>
+ <td class="ali03">
+ 閫佽揣鏃堕棿锛�
+ </td>
+ <td style="width: 215px">
+ <input id="txtBeginDate" 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>
+ <select keepdefaultstyle='true' id='selDriver' runat="server" datatextfield='Name' datavaluefield='Keyid'>
+ </select>
+ </td>
+ <td class="ali03">
+ 瀛︽牎锛�
+ </td>
+ <td>
+ <input id='txtXuexiao' runat="server" maxlength='50' />
+ </td>
+ <td class="ali03">
+ 閫佽揣鐘舵�侊細
+ </td>
+ <td>
+ <select keepdefaultstyle='true' id='selOrderState' runat="server" >
+ <option value="">璇烽�夋嫨</option>
+ <option value="0">鏈��</option>
+ <option value="1">閰嶉�佷腑</option>
+ <option value="2">宸查��</option>
+ </select>
+ </td>
+
+ <td >
+ <asp:Button ID="btn_Submit" Text="鏌ヨ" runat="server" OnClick="btn_Search_Click" /> <input type="button" value='閲嶇疆' onclick='document.body.innerHTML="";window.location=window.location;' />
+ </td>
+ </tr>
+ </table>
+ </div>
+
+ <div>
+ <asp:Repeater ID="RepClientList" runat="server">
+ <HeaderTemplate>
+ <table class="tableStyle">
+ <tr>
+ <th width="30" style="text-align: center">
+ 缂栧彿
+ </th>
+ <th style="text-align: center">
+ 鏃ユ湡
+ </th>
+ <th style="text-align: center">
+ 瀹㈡埛鍚嶇О
+ </th>
+ <th style="text-align: center">
+ 鐗囧尯
+ </th>
+ <th style="text-align: center">
+ 瀛︽牎
+ </th>
+ <th style="text-align: center">
+ 鍙告満
+ </th>
+ <th style="text-align: center">
+ 閫佽揣鐘舵��
+ </th>
+
+
+ <th style="text-align: center">
+ 鎿嶄綔
+ </th>
+ </tr>
+ </HeaderTemplate>
+ <ItemTemplate>
+ <tr>
+
+ <td style="text-align: center">
+ <%#Container.ItemIndex + 1+ this.UCPager1.PageSize * (this.UCPager1.PageIndex - 1)%>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("MakeTime", "{0:yyyy-MM-dd HH:mm}")%>
+ </td>
+
+ <td style="text-align: center">
+ <%#Eval("BuyerName")%>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("pianqu")%>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("shipAddress")%>
+ </td>
+
+ <td style="text-align: center">
+ <%#Eval("DriverName")%>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("OrderStateName")%>
+ </td>
+
+ <td class="Operate " style="text-align: center">
+ <span onclick="onViewCarInsurance('<%#Eval("id")%>')">鏌ョ湅鏄庣粏</span>
+
+
+
+
+ </td>
+ </tr>
+ </ItemTemplate>
+ <FooterTemplate>
+ </table>
+ </FooterTemplate>
+ </asp:Repeater>
+ <div id="page">
+ <uc:UCPager ID="UCPager1" runat="server" />
+ </div>
+ </div>
+ </div>
+ </form>
+</body>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx.cs
new file mode 100644
index 0000000..ba75b6d
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx.cs
@@ -0,0 +1,99 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using CY.BLL;
+using CY.BLL.Sys;
+using CY.Model;
+using CY.Infrastructure.Query;
+using CY.Infrastructure.Common;
+using CY.BLL.EC;
+using CY.Model.Inquiry;
+
+namespace CY.WebForm.Pages.business
+{
+ //鍚磋緣
+ //琛屾斂绠＄悊
+ public partial class DeliverWorkBookLiShiAnPaiList : BasePage
+ {
+ CoreDeliverOrderBLL _CoreDeliverOrderBLL = null;
+ OA_StaffBLL bll_OA_StaffBLL = null;
+
+ //鍒濆鍖�
+ public DeliverWorkBookLiShiAnPaiList()
+ {
+
+ bll_OA_StaffBLL = new OA_StaffBLL();
+ _CoreDeliverOrderBLL = new CoreDeliverOrderBLL();
+ }
+
+ //椤甸潰鍔犺浇
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ UCPager1.AspNetPager.PageChanged += AspNetPager1_PageChanged;
+ if (!IsPostBack)
+ {
+ this.selDriver.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, false, false).Where(x => x.SM_Post == "鍙告満"); ;
+ this.selDriver.DataTextField = "Name";
+ this.selDriver.DataValueField = "Keyid";
+ this.selDriver.DataBind();
+ this.selDriver.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+
+
+
+
+
+ BindList();
+ }
+
+ }
+
+ //缁戝畾鏁版嵁
+ private void BindList()
+ {
+ Pagination pa = new Pagination();
+ pa.PageSize = UCPager1.AspNetPager.PageSize;
+ pa.PageIndex = UCPager1.AspNetPager.CurrentPageIndex;
+
+ var coreDeliverOrders = _CoreDeliverOrderBLL.SelectModelPageLishi(pa, CurrentUser.MemberId, this.selDriver.Value.ToInt32(),this.txtXuexiao.Value.Trim(),this.txtBuyerName.Value.Trim(), this.txtBeginDate.Value.Trim(), this.txtEndDate.Value.Trim(),this.selOrderState.Value);
+ foreach (var coreDeliverOrder in coreDeliverOrders)
+ {
+ if (coreDeliverOrder.DriverId.HasValue)
+ {
+ var oA_Staff = bll_OA_StaffBLL.GetModelByKeyid(coreDeliverOrder.DriverId);
+ if (oA_Staff != null)
+ {
+ coreDeliverOrder.DriverName = oA_Staff.Name;
+ }
+ }
+ else
+ {
+ var oA_Staff1 = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, false, false).Where(x => x.MobieNum == coreDeliverOrder.DeliveryMoble).FirstOrDefault();
+ if (oA_Staff1 != null)
+ {
+ coreDeliverOrder.DriverName = oA_Staff1.Name;
+ }
+ }
+
+ }
+
+ this.RepClientList.DataSource = coreDeliverOrders;
+ this.RepClientList.DataBind();
+ UCPager1.AspNetPager.RecordCount = pa.RecordCount;
+ }
+
+ //鍒嗛〉浜嬩欢
+ protected void AspNetPager1_PageChanged(object src, EventArgs e)
+ {
+ BindList();
+ }
+
+ //鏌ヨ浜嬩欢
+ protected void btn_Search_Click(object src, EventArgs e)
+ {
+ BindList();
+ }
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx.designer.cs
new file mode 100644
index 0000000..f5ea454
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx.designer.cs
@@ -0,0 +1,125 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.business
+{
+
+
+ public partial class DeliverWorkBookLiShiAnPaiList
+ {
+
+ /// <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>
+ /// txtBuyerName 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtBuyerName;
+
+ /// <summary>
+ /// txtBeginDate 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtBeginDate;
+
+ /// <summary>
+ /// txtEndDate 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtEndDate;
+
+ /// <summary>
+ /// selDriver 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selDriver;
+
+ /// <summary>
+ /// txtXuexiao 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtXuexiao;
+
+ /// <summary>
+ /// selOrderState 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selOrderState;
+
+ /// <summary>
+ /// btn_Submit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button btn_Submit;
+
+ /// <summary>
+ /// RepClientList 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Repeater RepClientList;
+
+ /// <summary>
+ /// UCPager1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::CY.WebForm.Pages.common.UCPager UCPager1;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx
index 9ab674f..588fdd8 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx
@@ -58,15 +58,16 @@
}
)
if (deleteKeyIds == "") {
- top.Dialog.alert("璇烽�夋嫨瑕佸垹闄ょ殑璁板綍", function () {
+ top.Dialog.alert("璇烽�夋嫨瑕佸畨鎺掔殑璁板綍", function () {
});
return;
}
else {
deleteKeyIds = deleteKeyIds.substring(0, deleteKeyIds.length - 1);
- top.Dialog.confirm("纭畾瑕佸垹闄ゆ墍閫夎褰曞悧锛�", function () {
- window.location = "/Pages/business/DeliverWorkBookSonghuo.aspx?deleteKeyIds=" + deleteKeyIds;
- });
+ top.Dialog.open({ URL: "/Pages/business/DeliverWorkBookAnPai.aspx?ids=" + deleteKeyIds, Title: "閫佽揣瀹夋帓", Width: 600, Height: 300 });
+ //top.Dialog.confirm("纭畾瑕佸畨鎺掓墍閫夎褰曞悧锛�", function () {
+ // window.location = "/Pages/business/DeliverWorkBookSonghuo.aspx?deleteKeyIds=" + deleteKeyIds;
+ //});
}
}
$(function () {
@@ -113,6 +114,9 @@
<td colspan="8">
<asp:Button ID="btn_Submit" Text="鏌ヨ" runat="server" OnClick="btn_Search_Click" /> <input type="button" value='閲嶇疆' onclick='document.body.innerHTML="";window.location=window.location;' />
<input type="hidden" runat="server" id="hideOrderId" />
+
+ <input type="button" value='閫佽揣瀹夋帓' onclick="onAllDelete()"/>
+
</td>
</tr>
</table>
@@ -123,6 +127,9 @@
<HeaderTemplate>
<table class="tableStyle">
<tr>
+ <th width="25" >
+
+ </th>
<th width="30" style="text-align: center" >
缂栧彿
</th>
@@ -137,7 +144,9 @@
</HeaderTemplate>
<ItemTemplate>
<tr>
-
+ <td>
+ <input type="checkbox" value='<%#Eval("id")%>' />
+ </td>
<td style="text-align: center">
<%#Eval("Bianhao")%> <%--<%#Container.ItemIndex + 1%>--%>
</td>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs
index a14f092..04feac1 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs
@@ -102,7 +102,7 @@
if (string.IsNullOrEmpty(biaotou))
{
- string biaotou2 = " <th style=\"text-align:center\" > </th> <th style=\"text-align:center\" > </th> <th style=\"text-align:center\" > </th>";
+ string biaotou2 = "<th style=\"text-align:center\" > </th> <th style=\"text-align:center\" > </th> <th style=\"text-align:center\" > </th> <th style=\"text-align:center\" > </th>";
foreach (var inquiryWorkBookModel in inquiryWorkBookModels)
{
biaotou += " <th style=\"text-align:center\" colspan=\"2\"> " + inquiryWorkBookModel.WorkBookSizeTxt + inquiryWorkBookModel.WorkBookNameTxt + " </th> ";
@@ -249,7 +249,7 @@
- biaowei = " <td style=\"color: grey;text-align: center;\" > " + PlanOrderid.Count +" </td><td style=\"text-align:center\"> </td> <td style=\"text-align:center\"> </td> ";
+ biaowei = " <td></td> <td style=\"color: grey;text-align: center;\" > " + PlanOrderid.Count +" </td><td style=\"text-align:center\"> </td> <td style=\"text-align:center\"> </td> ";
foreach (var inquiryWorkBookModel in inquiryWorkBookModels)
{
var nums = cmsPlanOrderItems.Where(x => x.name == inquiryWorkBookModel.WorkBookNameTxt && x.specification == inquiryWorkBookModel.WorkBookSizeTxt && PlanOrderid.Contains(x.orderId)).Sum(x => x.nums);
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingApply.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingApply.aspx.cs
index 43d323c..19d23d8 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 f11d450..3a9ca77 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 54db765..888513c 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx
@@ -251,7 +251,9 @@
<select keepdefaultstyle='true' class=' firstfocus' id='selKaipiaoshenqing' runat="server" datatextfield="Name" datavaluefield="MeanValue">
</select>
</td>
-
+ <td >
+
+ </td>
@@ -287,10 +289,13 @@
</td>
- <td >
-
-
+ <td class="ali03">
+ 鍙戠エ鍙凤細
</td>
+ <td>
+ <input id='txtFapiaohao' runat="server" />
+ </td>
+
<td >
<asp:button id="btn_Search" text="鏌ヨ" runat="server" /> <input type="button" value='閲嶇疆' onclick='document.body.innerHTML="";window.location=window.location;' />
<asp:Button ID="Button1" Text="瀵煎嚭" OnClientClick="showProgress();return true;" runat="server" OnClick="btn_Daochu_Click" />
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx.cs
index 42b9154..01b7a64 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx.cs
@@ -690,7 +690,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, this.selPayStates.Value, this.selHuikuanStates.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.Trim(), this.selPayStates.Value, this.selHuikuanStates.Value,this.txtFapiaohao.Value.Trim() );
rptData.DataSource = result;
rptData.DataBind();
@@ -759,7 +759,7 @@
- IEnumerable<OA_Kaipiaoshenqing> results = oA_KaipiaoshenqingBLL.SelectModelPage(pa, 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);
+ IEnumerable<OA_Kaipiaoshenqing> results = oA_KaipiaoshenqingBLL.SelectModelPage(pa, CurrentUser.MemberId, this.txtSQBeginDate.Value, this.txtSQEndDate.Value, this.selKaipiaoshenqing.Value, this.selKehuqianshou.Value, this.selBusinessManager.Value, this.txtCustormerName.Value.Trim(), this.selPayStates.Value, this.selHuikuanStates.Value, this.txtFapiaohao.Value.Trim());
// 鍒涘缓宸ヤ綔绨�
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 2957cc5..48c5e25 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx.designer.cs
@@ -114,6 +114,15 @@
protected global::System.Web.UI.HtmlControls.HtmlSelect selHuikuanStates;
/// <summary>
+ /// txtFapiaohao 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtFapiaohao;
+
+ /// <summary>
/// btn_Search 鎺т欢銆�
/// </summary>
/// <remarks>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongEdit.aspx
index 052e96b..f6a97ca 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongEdit.aspx
@@ -121,9 +121,14 @@
function changeselCateId(obj) {
if ($(obj).val() == "") {
- $("#txtCarNumbera").val("");
+ //$("#txtCarNumbera").val("");
} else {
- $("#txtCarNumbera").val($(obj).find("option:selected").text());
+ if ($("#txtCarNumbera").val() == "") {
+ $("#txtCarNumbera").val( $(obj).find("option:selected").text());
+ } else {
+ $("#txtCarNumbera").val($("#txtCarNumbera").val() + "," + $(obj).find("option:selected").text());
+ }
+
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongList.aspx
index 025576a..5ff2140 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongList.aspx
@@ -126,15 +126,18 @@
<th width="30" style="text-align: center">
缂栧彿
</th>
-
+ <th style="text-align: center" width="60">
+ 閮ㄩ棬
+ </th>
+ <th style="text-align: center" width="60">
+ 濮撳悕
+ </th>
<th style="text-align: center">
宸ヤ綔鍐呭
</th>
- <th style="text-align: center" width="60">
- 璐ｄ换浜�
- </th>
+
<th style="text-align: center" width="100">
@@ -150,14 +153,17 @@
<td style="text-align: center">
<%#Container.ItemIndex + 1+ this.UCPager1.PageSize * (this.UCPager1.PageIndex - 1)%>
</td>
-
+ <td style="text-align: center">
+ <%#Eval("DepartmentName")%>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("ZerenrenName")%>
+ </td>
<td title=" <%#Eval("Gongzuozhize")%> " >
<%#Eval("Gongzuozhize")%>
</td>
- <td style="text-align: center">
- <%#Eval("ZerenrenName")%>
- </td>
+
<td class="Operate " style="text-align: center">
<span menu_member_case_id="case_CarEdit" menu_member_case_name="淇敼" onclick="onEdit('<%#Eval("Keyid")%>')">淇敼</span>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongList.aspx.cs
index 0ad2a1a..43e819a 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongList.aspx.cs
@@ -19,14 +19,17 @@
OA_GongzuoneirongBLL bll_OA_GongzuoneirongBLL = null;
OA_StaffBLL bll_OA_StaffBLL = null;
-
+ OA_DepartmentBll bll_departmentBll = null;
+
//鍒濆鍖�
public GongzuoneirongList()
{
bll_OA_GongzuoneirongBLL = new OA_GongzuoneirongBLL();
bll_OA_StaffBLL = new OA_StaffBLL();
-
+ bll_departmentBll = new OA_DepartmentBll();
+
+
}
//椤甸潰鍔犺浇
@@ -94,9 +97,23 @@
Pagination pa = new Pagination();
pa.PageSize = 50;
pa.PageIndex = UCPager1.AspNetPager.CurrentPageIndex;
- var Gongzuoneirongs = bll_OA_GongzuoneirongBLL.SelectModelPage(pa, CurrentUser.MemberId, this.txtName.Value, this.selZerenren.Value.ToInt32());
-
-
+ var oA_Gongzuoneirongs = bll_OA_GongzuoneirongBLL.SelectModelPage(pa, CurrentUser.MemberId, this.txtName.Value, this.selZerenren.Value.ToInt32());
+ foreach (var oA_Gongzuoneirong in oA_Gongzuoneirongs)
+ {
+ var staff = bll_OA_StaffBLL.GetModelByKeyid(oA_Gongzuoneirong.Zerenren);
+ if (staff != null)
+ {
+ var department = bll_departmentBll.GetModelByKeyid(staff.DepartmentId);
+ if (department != null)
+ {
+ oA_Gongzuoneirong.DepartmentName = department.Name;
+ }
+ }
+ }
+ var Gongzuoneirongs = oA_Gongzuoneirongs;
+
+
+
this.RepClientList.DataSource = Gongzuoneirongs;
this.RepClientList.DataBind();
UCPager1.AspNetPager.RecordCount = pa.RecordCount;
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuozhizeList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuozhizeList.aspx
index 889ef56..2719b52 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuozhizeList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuozhizeList.aspx
@@ -126,15 +126,15 @@
<th width="30" style="text-align: center">
缂栧彿
</th>
-
+ <th style="text-align: center" width="60">
+ 璐ｄ换浜�
+ </th>
<th style="text-align: center">
宸ヤ綔鑱岃矗
</th>
- <th style="text-align: center" width="60">
- 璐ｄ换浜�
- </th>
+
<th style="text-align: center" width="100">
@@ -150,14 +150,14 @@
<td style="text-align: center">
<%#Container.ItemIndex + 1+ this.UCPager1.PageSize * (this.UCPager1.PageIndex - 1)%>
</td>
-
+ <td style="text-align: center">
+ <%#Eval("ZerenrenName")%>
+ </td>
<td title=" <%#Eval("Gongzuozhize")%> " >
<%#Eval("Gongzuozhize")%>
</td>
- <td style="text-align: center">
- <%#Eval("ZerenrenName")%>
- </td>
+
<td class="Operate " style="text-align: center">
<span menu_member_case_id="case_CarEdit" menu_member_case_name="淇敼" onclick="onEdit('<%#Eval("Keyid")%>')">淇敼</span>
--
Gitblit v1.9.1