From 0fb5eab0d6787922d3e915543e95fe5073d767ff Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 13 三月 2025 08:48:13 +0800
Subject: [PATCH] 派了车就不能再派车了 派车的时候选择新的送货时间和填写注意事项 完成
---
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderSonghuoanchiList.aspx | 6
CY_ECommercePlatform/CY.BLL/CY.BLL.csproj | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheZhuyishixiang.aspx.cs | 127 +
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanDakaList.aspx.designer.cs | 116 +
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheList.aspx | 672 +++++++
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanFujianShow.aspx.cs | 4
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanChehui.aspx | 55
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaiche.aspx.designer.cs | 22
CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.designer.cs | 18
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheZhuyishixiang.aspx.designer.cs | 80
CY_ECommercePlatform/CY.Model/CY.Model.csproj | 1
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheList.aspx.cs | 543 ++++++
CY_ECommercePlatform/CY.IDAL/OA/IOA_DeliverPlanDAL.cs | 7
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaiche.aspx.cs | 127 +
CY_ECommercePlatform/CY.Model/OA/OA_DriverRecord.cs | 262 ++
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheEdit.aspx | 241 ++
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanSort.aspx.cs | 4
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanEdit.aspx | 2
CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj | 40
CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanBLL.cs | 30
CY_ECommercePlatform/CY.BLL/OA/OA_DriverRecordBLL.cs | 123 +
CY_ECommercePlatform/CY.SQLDAL/CY.SQLDAL.csproj | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverOrderPrint.aspx.cs | 14
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaiche.aspx | 182 +
CY_ECommercePlatform/CY.IDAL/CY.IDAL.csproj | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.cs | 16
CY_ECommercePlatform/CY.WebForm/Pages/business/PrintAwbOrder.aspx.cs | 4
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPrint.aspx.cs | 5
CY_ECommercePlatform/CY.SQLDAL/OA/OA_DeliverPlanPaicheDAL.cs | 337 +++
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanGongzuokaoping.aspx.cs | 6
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx | 2
CY_ECommercePlatform/CY.IDAL/OA/IOA_DeliverPlanPaicheDAL.cs | 40
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheZhuyishixiang.aspx | 49
CY_ECommercePlatform/CY.SQLDAL/OA/OA_DriverRecordDAL.cs | 160 +
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProdactionList.aspx | 6
CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanChehui.aspx.designer.cs | 44
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheEdit.aspx.designer.cs | 134 +
CY_ECommercePlatform/AbstractFactory/Factory.cs | 13
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanYijiao.aspx.cs | 45
CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx.cs | 14
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx | 43
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanChehui.aspx.cs | 153 +
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheList.aspx.designer.cs | 197 ++
CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanPaicheBLL.cs | 246 ++
CY_ECommercePlatform/CY.SQLDAL/OA/OA_DeliverPlanDAL.cs | 24
CY_ECommercePlatform/CY.IDAL/OA/IOA_DriverRecordDAL.cs | 26
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanEdit.aspx.cs | 5
CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs | 22
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanDakaList.aspx | 508 +++++
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanDakaList.aspx.cs | 236 ++
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheEdit.aspx.cs | 353 +++
53 files changed, 5,177 insertions(+), 197 deletions(-)
diff --git a/CY_ECommercePlatform/AbstractFactory/Factory.cs b/CY_ECommercePlatform/AbstractFactory/Factory.cs
index e650a16..22d378c 100644
--- a/CY_ECommercePlatform/AbstractFactory/Factory.cs
+++ b/CY_ECommercePlatform/AbstractFactory/Factory.cs
@@ -268,6 +268,8 @@
OBJECT_PATH.Add(DALInterface.IOA_WorkPlan_shenpiDAL, "OA_WorkPlan_shenpiDAL");
OBJECT_PATH.Add(DALInterface.IOA_WorkPlan_attachmentDAL, "OA_WorkPlan_attachmentDAL");
OBJECT_PATH.Add(DALInterface.IOA_ShejijijianDAL, "OA_ShejijijianDAL");
+ OBJECT_PATH.Add(DALInterface.IOA_DeliverPlanPaicheDAL, "OA_DeliverPlanPaicheDAL");
+ OBJECT_PATH.Add(DALInterface.IOA_DriverRecordDAL, "OA_DriverRecordDAL");
OBJECT_PATH.Add(DALInterface.IOA_KaipiaonewDAL, "OA_KaipiaonewDAL");
OBJECT_PATH.Add(DALInterface.ICoreCmsPlanOrderDAL, "CoreCmsPlanOrderDAL");
OBJECT_PATH.Add(DALInterface.ICoreCmsPlanOrderItemDAL, "CoreCmsPlanOrderItemDAL");
@@ -923,6 +925,17 @@
/// </summary>
IOA_ShejijijianDAL = 1940,
+ /// <summary>
+ /// 閫佽揣瀹夋帓
+ /// </summary>
+ IOA_DeliverPlanPaicheDAL = 1941,
+
+
+ /// <summary>
+ /// 閫佽揣瀹夋帓
+ /// </summary>
+ IOA_DriverRecordDAL = 1942,
+
/// <summary>
/// 寮�绁ㄧ敵璇�
diff --git a/CY_ECommercePlatform/CY.BLL/CY.BLL.csproj b/CY_ECommercePlatform/CY.BLL/CY.BLL.csproj
index 1b065ae..9234b7c 100644
--- a/CY_ECommercePlatform/CY.BLL/CY.BLL.csproj
+++ b/CY_ECommercePlatform/CY.BLL/CY.BLL.csproj
@@ -169,9 +169,11 @@
<Compile Include="OA\OA_CuikuanjiluBLL.cs" />
<Compile Include="OA\OA_CustomerApplyBLL.cs" />
<Compile Include="OA\OA_DeliverPlanBLL.cs" />
+ <Compile Include="OA\OA_DeliverPlanPaicheBLL.cs" />
<Compile Include="OA\OA_DepartmentBLL.cs" />
<Compile Include="OA\OA_DocumentBLL.cs" />
<Compile Include="OA\OA_DocumentDicBLL.cs" />
+ <Compile Include="OA\OA_DriverRecordBLL.cs" />
<Compile Include="OA\OA_FukuanshenqingBLL.cs" />
<Compile Include="OA\OA_KaipiaoJineQuerenBLL.cs" />
<Compile Include="OA\OA_KaipiaonewBLL.cs" />
diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanBLL.cs
index 0771cec..2b8837c 100644
--- a/CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanBLL.cs
@@ -119,6 +119,19 @@
return _IOA_DeliverPlanDAL.GetModelByformid(formid);
}
+
+
+ /// <summary>
+ /// 鏍规嵁deliverPlanPaicheid鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="deliverPlanPaicheid">缂栧彿</param>
+ /// <returns></returns>
+ public IEnumerable<Model.OA_DeliverPlan> GetModelByDeliverPlanPaicheid(Guid deliverPlanPaicheid)
+ {
+
+ return _IOA_DeliverPlanDAL.GetModelByDeliverPlanPaicheid(deliverPlanPaicheid);
+ }
+
/// <summary>
/// 鑾峰彇鍏ㄩ儴鍚堜綔瀹㈡埛
/// </summary>
@@ -154,7 +167,7 @@
/// <param name="pa"></param>
/// <returns></returns>
public IEnumerable<OA_DeliverPlan> SelectModelPage(Pagination pa, Guid FirmId, string DeliveredTime,
- string CarId, string DriverId,string trueMemberId ="", string CustormerName = "", string BusinessManager = "")
+ string CarId, string DriverId,string trueMemberId ="", string CustormerName = "", string BusinessManager = "", string Paiche = "")
{
string Condition = " and od.FirmId ='" + FirmId + "' and od.shifouDelivery = 1 ";
string sort = " Dizhi asc ";
@@ -167,7 +180,7 @@
}
else
{
- Condition += " and DATEDIFF(day,GETDATE(),od.[DeliverTime])<0 and od.[DeliveredTime] is null ";
+ Condition += " and DATEDIFF(day,GETDATE(),od.[DeliverTime])<0 ";
sort = " DeliverTime desc,Dizhi asc ";
}
}
@@ -183,6 +196,19 @@
Condition += " and od.BusinessManagerId = '" + BusinessManager + "'";
if (!string.IsNullOrEmpty(CustormerName))
Condition += " and od.CompanyName like '%" + CustormerName + "%'";
+ if (!string.IsNullOrEmpty(Paiche))
+ {
+ if(Paiche == "1")
+ {
+ Condition += " and od.CarId >0";
+ }
+ else
+ {
+ Condition += " and ( od.CarId = 0 or od.CarId is null )";
+ }
+
+ }
+
Query query = new Query();
IList<Criterion> criterias = new List<Criterion>()
diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanPaicheBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanPaicheBLL.cs
new file mode 100644
index 0000000..bd02330
--- /dev/null
+++ b/CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanPaicheBLL.cs
@@ -0,0 +1,246 @@
+锘�
+/**
+* OA_DeliverPlanBLL.cs
+*
+* 鍔� 鑳斤細 鍚堜綔瀹㈡埛涓氬姟閫昏緫绫�
+* 绫� 鍚嶏細 OA_DeliverPlanBLL
+*
+* Ver 鍙樻洿鏃ユ湡 璐熻矗浜� 鍙樻洿鍐呭
+* 鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�
+* V0.01 2013-4-2 15:11 鍚磋緣 鍒濈増
+* V0.02 2013-5-29 17:43 鍚村磶鍧� 澧炲姞杞崲鍦ㄧ嚎浼氬憳涓哄巶鍟嗗鎴锋柟娉�
+*
+*
+*
+*
+*
+*
+*/
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using CY.IDAL;
+using CY.Model;
+using AbstractFactory;
+using CY.IBaseDAL;
+using CY.Infrastructure.DESEncrypt;
+using CY.Infrastructure.Query;
+
+namespace CY.BLL
+{
+ public class OA_DeliverPlanPaicheBLL
+ {
+ IOA_DeliverPlanPaicheDAL _IOA_DeliverPlanPaicheDAL = null;
+
+ /// <summary>
+ /// 鍒濆鍖栨瀯閫�
+ /// </summary>
+ public OA_DeliverPlanPaicheBLL()
+ {
+ //鑾峰彇OA_DeliverPlan DAL瀹炵幇
+ _IOA_DeliverPlanPaicheDAL = Factory.GetDALByInterfaceName(DALInterface.IOA_DeliverPlanPaicheDAL) as IOA_DeliverPlanPaicheDAL;
+
+
+ }
+
+ /// <summary>
+ /// 鏂板閫佽揣瀹夋帓
+ /// </summary>
+ /// <param name="rType"></param>
+ /// <param name="m_OA_CustomerCommunications"></param>
+ /// <param name="m_EC_AcceptWayByCustomers"></param>
+ /// <returns></returns>
+ public bool InsertModel(CY.Model.OA_DeliverPlan m_OA_DeliverPlan)
+ {
+ try
+ {
+ if (m_OA_DeliverPlan.Yichangchuli == null)
+ {
+ m_OA_DeliverPlan.Yichangchuli = "";
+ }
+ if (m_OA_DeliverPlan.Xingzhengzhuize == null)
+ {
+ m_OA_DeliverPlan.Xingzhengzhuize = "";
+ }
+ return _IOA_DeliverPlanPaicheDAL.InserModel(m_OA_DeliverPlan);
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
+ /// <summary>
+ /// 淇敼閫佽揣瀹夋帓
+ /// </summary>
+ /// <param name="rType"></param>
+ /// <returns></returns>
+ public bool UpdateModel(CY.Model.OA_DeliverPlan m_OA_DeliverPlan)
+ {
+ try
+ {
+ if (m_OA_DeliverPlan.Yichangchuli == null)
+ {
+ m_OA_DeliverPlan.Yichangchuli = "";
+ }
+ if (m_OA_DeliverPlan.Xingzhengzhuize == null)
+ {
+ m_OA_DeliverPlan.Xingzhengzhuize = "";
+ }
+ return _IOA_DeliverPlanPaicheDAL.UpdateModel(m_OA_DeliverPlan);
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇鍏ㄩ儴鍚堜綔瀹㈡埛
+ /// </summary>
+ /// <param name="Keyid">涓婚敭id</param>
+ /// <returns></returns>
+ public IEnumerable<OA_DeliverPlan> GetModelList()
+ {
+ Query query = new Query();
+ return _IOA_DeliverPlanPaicheDAL.SelectAllModel(query);
+ }
+
+
+ /// <summary>
+ /// 鏍规嵁formid鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ public IEnumerable<Model.OA_DeliverPlan> GetModelByformid(Guid formid)
+ {
+
+ return _IOA_DeliverPlanPaicheDAL.GetModelByformid(formid);
+ }
+
+
+ /// <summary>
+ /// 鏍规嵁formid鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ public IEnumerable<Model.OA_DeliverPlan> GetModelByDeliveredTime(Guid FirmId, DateTime DeliverTime)
+ {
+
+ return _IOA_DeliverPlanPaicheDAL.GetModelByDeliveredTime(FirmId, DeliverTime);
+ }
+
+
+
+
+ /// <summary>
+ /// 鑾峰彇鍏ㄩ儴鍚堜綔瀹㈡埛
+ /// </summary>
+ /// <param name="Keyid">涓婚敭id</param>
+ /// <returns></returns>
+ public OA_DeliverPlan GetModelByKeyid(Guid? keyid, Guid? BuyerId, DateTime? DeliveryTime)
+ {
+
+ return _IOA_DeliverPlanPaicheDAL.GetModelByKeyid(keyid, BuyerId, DeliveryTime);
+ }
+
+ /// <summary>
+ /// 鍒犻櫎鍚堜綔瀹㈡埛
+ /// </summary>
+ /// <param name="rType"></param>
+ /// <returns></returns>
+ public bool DeleteModel(CY.Model.OA_DeliverPlan rType)
+ {
+ try
+ {
+ _IOA_DeliverPlanPaicheDAL.DeleteModel(rType);
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ return true;
+ }
+
+ /// <summary>
+ /// 鏌ヨ鍚堜綔瀹㈡埛鍒嗛〉鍒楄〃
+ /// </summary>
+ /// <param name="pa"></param>
+ /// <returns></returns>
+ public IEnumerable<OA_DeliverPlan> SelectModelPage(Pagination pa, Guid FirmId, string DeliveredTime,
+ string CarId, string DriverId, string DeliveredTimeStart, string DeliveredTimeEnd, string trueMemberId = "", string CustormerName = "", string BusinessManager = "", string wancheng = "")
+ {
+ string Condition = " and od.FirmId ='" + FirmId + "' and od.shifouDelivery = 1 ";
+ string sort = " [Sort] asc ";
+ if (string.IsNullOrEmpty(DeliveredTimeStart) && string.IsNullOrEmpty(DeliveredTimeEnd) && !string.IsNullOrEmpty(DeliveredTime))
+ {
+ if (DeliveredTime != "涓�鍛ㄥ悗")
+ {
+ Condition += " and DATEDIFF(day,od.[DeliverTime],'" + DeliveredTime + "')=0 ";
+
+ }
+ else
+ {
+ Condition += " and DATEDIFF(day,GETDATE(),od.[DeliverTime]) >= 6 ";
+ //sort = " DeliverTime desc,[Sort] asc ";
+
+ }
+ }
+
+ if (!string.IsNullOrEmpty(DeliveredTimeStart))
+ {
+ Condition += " and DATEDIFF(day,'"+ DeliveredTimeStart + "',od.[DeliverTime]) >= 0 ";
+ sort = " DeliverTime desc,[Sort] asc ";
+ }
+
+ if (!string.IsNullOrEmpty(DeliveredTimeEnd))
+ {
+ Condition += " and DATEDIFF(day,'" + DeliveredTimeEnd + "',od.[DeliverTime]) <= 0 ";
+ sort = " DeliverTime desc,[Sort] asc ";
+ }
+
+
+ if (!string.IsNullOrEmpty(CarId))
+ Condition += " and od.CarId = '" + CarId + "'";
+ if (!string.IsNullOrEmpty(DriverId))
+ Condition += " and od.DriverId = '" + DriverId + "'";
+ if (!string.IsNullOrEmpty(trueMemberId))
+ Condition += " and oss.MemberId = '" + trueMemberId + "'";
+ if (!string.IsNullOrEmpty(BusinessManager))
+ Condition += " and od.BusinessManagerId = '" + BusinessManager + "'";
+ if (!string.IsNullOrEmpty(CustormerName))
+ Condition += " and od.CompanyName like '%" + CustormerName + "%'";
+ if (!string.IsNullOrEmpty(wancheng))
+ {
+ if (wancheng == "1")
+ {
+ Condition += " and od.DeliveredTime is not null ";
+ }
+ else
+ {
+ Condition += " and od.DeliveredTime is null";
+ }
+
+ }
+
+
+ Query query = new Query();
+ IList<Criterion> criterias = new List<Criterion>()
+ {
+ new Criterion("", Condition),
+
+ new Criterion("orderBy",sort)
+ };
+ query.Criteria = criterias;
+ return _IOA_DeliverPlanPaicheDAL.SelectModelPage(query, pa);
+ }
+
+
+
+
+
+
+
+ }
+}
diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_DriverRecordBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_DriverRecordBLL.cs
new file mode 100644
index 0000000..3c90782
--- /dev/null
+++ b/CY_ECommercePlatform/CY.BLL/OA/OA_DriverRecordBLL.cs
@@ -0,0 +1,123 @@
+锘�
+/**
+* OA_DriverRecordBLL.cs
+*
+* 鍔� 鑳斤細 鍚堜綔瀹㈡埛涓氬姟閫昏緫绫�
+* 绫� 鍚嶏細 OA_DriverRecordBLL
+*
+* Ver 鍙樻洿鏃ユ湡 璐熻矗浜� 鍙樻洿鍐呭
+* 鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�
+* V0.01 2013-4-2 15:11 鍚磋緣 鍒濈増
+* V0.02 2013-5-29 17:43 鍚村磶鍧� 澧炲姞杞崲鍦ㄧ嚎浼氬憳涓哄巶鍟嗗鎴锋柟娉�
+*
+*
+*
+*
+*
+*
+*/
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using CY.IDAL;
+using CY.Model;
+using AbstractFactory;
+using CY.IBaseDAL;
+using CY.Infrastructure.DESEncrypt;
+using CY.Infrastructure.Query;
+
+namespace CY.BLL
+{
+ public class OA_DriverRecordBLL
+ {
+ IOA_DriverRecordDAL _IOA_DriverRecordDAL = null;
+
+ /// <summary>
+ /// 鍒濆鍖栨瀯閫�
+ /// </summary>
+ public OA_DriverRecordBLL()
+ {
+ //鑾峰彇OA_DriverRecord DAL瀹炵幇
+ _IOA_DriverRecordDAL = Factory.GetDALByInterfaceName(DALInterface.IOA_DriverRecordDAL) as IOA_DriverRecordDAL;
+
+
+ }
+
+
+ /// <summary>
+ /// 鑾峰彇鍏ㄩ儴鍚堜綔瀹㈡埛
+ /// </summary>
+ /// <param name="Keyid">涓婚敭id</param>
+ /// <returns></returns>
+ public IEnumerable<OA_DriverRecord> GetModelList()
+ {
+ Query query = new Query();
+ return _IOA_DriverRecordDAL.SelectAllModel(query);
+ }
+
+
+
+
+ /// <summary>
+ /// 鑾峰彇鍏ㄩ儴鍚堜綔瀹㈡埛
+ /// </summary>
+ /// <param name="Keyid">涓婚敭id</param>
+ /// <returns></returns>
+ public OA_DriverRecord GetModelByKeyid(Guid keyid)
+ {
+
+ return _IOA_DriverRecordDAL.GetModelByKeyid(keyid);
+ }
+
+
+ /// <summary>
+ /// 鏌ヨ鍚堜綔瀹㈡埛鍒嗛〉鍒楄〃
+ /// </summary>
+ /// <param name="pa"></param>
+ /// <returns></returns>
+ public IEnumerable<OA_DriverRecord> SelectModelPage(Pagination pa, string CreatTimeStart, string CreatTimeEnd,
+ string CarID, string CreaterName,string ClockType)
+ {
+ string Condition = " ";
+ string sort = " CreatTime desc ";
+
+
+ if (!string.IsNullOrEmpty(CreatTimeStart))
+ {
+ Condition += " and DATEDIFF(day,'" + CreatTimeStart + "',od.[CreatTime]) >= 0 ";
+
+ }
+
+ if (!string.IsNullOrEmpty(CreatTimeEnd))
+ {
+ Condition += " and DATEDIFF(day,'" + CreatTimeEnd + "',od.[CreatTime]) <= 0 ";
+
+ }
+
+
+ if (!string.IsNullOrEmpty(CarID))
+ Condition += " and od.CarID = " + CarID + "";
+ if (!string.IsNullOrEmpty(ClockType))
+ Condition += " and od.ClockType = " + ClockType + "";
+
+
+ if (!string.IsNullOrEmpty(CreaterName))
+ Condition += " and od.Creater like '%" + CreaterName + "%'";
+
+
+ Query query = new Query();
+ IList<Criterion> criterias = new List<Criterion>()
+ {
+ new Criterion("", Condition),
+
+ new Criterion("orderBy",sort)
+ };
+ query.Criteria = criterias;
+ return _IOA_DriverRecordDAL.SelectModelPage(query, pa);
+ }
+
+
+
+ }
+}
diff --git a/CY_ECommercePlatform/CY.IDAL/CY.IDAL.csproj b/CY_ECommercePlatform/CY.IDAL/CY.IDAL.csproj
index 06b75f2..c4dc6f2 100644
--- a/CY_ECommercePlatform/CY.IDAL/CY.IDAL.csproj
+++ b/CY_ECommercePlatform/CY.IDAL/CY.IDAL.csproj
@@ -163,6 +163,8 @@
<Compile Include="OA\IOA_CarrepairDAL.cs" />
<Compile Include="OA\IOA_CuikuanjiluDAL.cs" />
<Compile Include="OA\IOA_DeliverPlanDAL.cs" />
+ <Compile Include="OA\IOA_DeliverPlanPaicheDAL.cs" />
+ <Compile Include="OA\IOA_DriverRecordDAL.cs" />
<Compile Include="OA\IOA_FukuanshenqingDAL.cs" />
<Compile Include="OA\IOA_KaipiaoJineQuerenDAL.cs" />
<Compile Include="OA\IOA_KaipiaonewcuishouDAL.cs" />
diff --git a/CY_ECommercePlatform/CY.IDAL/OA/IOA_DeliverPlanDAL.cs b/CY_ECommercePlatform/CY.IDAL/OA/IOA_DeliverPlanDAL.cs
index 39984c2..b20477d 100644
--- a/CY_ECommercePlatform/CY.IDAL/OA/IOA_DeliverPlanDAL.cs
+++ b/CY_ECommercePlatform/CY.IDAL/OA/IOA_DeliverPlanDAL.cs
@@ -26,6 +26,13 @@
/// <returns></returns>
IEnumerable<Model.OA_DeliverPlan> GetModelByformid(Guid formid);
+ /// <summary>
+ /// 鏍规嵁formid鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ IEnumerable<Model.OA_DeliverPlan> GetModelByDeliverPlanPaicheid(Guid deliverPlanPaicheid);
+
}
}
diff --git a/CY_ECommercePlatform/CY.IDAL/OA/IOA_DeliverPlanPaicheDAL.cs b/CY_ECommercePlatform/CY.IDAL/OA/IOA_DeliverPlanPaicheDAL.cs
new file mode 100644
index 0000000..419a896
--- /dev/null
+++ b/CY_ECommercePlatform/CY.IDAL/OA/IOA_DeliverPlanPaicheDAL.cs
@@ -0,0 +1,40 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Data;
+using System.Data.SqlClient;
+using CY.IBaseDAL;
+using CY.Model;
+
+namespace CY.IDAL
+{
+ public interface IOA_DeliverPlanPaicheDAL : ICommonDAL, IPaging<OA_DeliverPlan>, IGetAllModel<OA_DeliverPlan>
+ {
+
+ /// <summary>
+ /// 鏍规嵁缂栧彿鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ OA_DeliverPlan GetModelByKeyid(Guid? keyid, Guid? BuyerId, DateTime? DeliveredTime);
+
+ /// <summary>
+ /// 鏍规嵁formid鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ IEnumerable<Model.OA_DeliverPlan> GetModelByformid(Guid formid);
+
+
+
+
+ /// <summary>
+ /// 鏍规嵁缂栧彿鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ IEnumerable<Model.OA_DeliverPlan> GetModelByDeliveredTime(Guid FirmId, DateTime DeliverTime);
+
+ }
+}
diff --git a/CY_ECommercePlatform/CY.IDAL/OA/IOA_DriverRecordDAL.cs b/CY_ECommercePlatform/CY.IDAL/OA/IOA_DriverRecordDAL.cs
new file mode 100644
index 0000000..218373c
--- /dev/null
+++ b/CY_ECommercePlatform/CY.IDAL/OA/IOA_DriverRecordDAL.cs
@@ -0,0 +1,26 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Data;
+using System.Data.SqlClient;
+using CY.IBaseDAL;
+using CY.Model;
+
+namespace CY.IDAL
+{
+ public interface IOA_DriverRecordDAL : ICommonDAL, IPaging<OA_DriverRecord>, IGetAllModel<OA_DriverRecord>
+ {
+
+ /// <summary>
+ /// 鏍规嵁缂栧彿鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ OA_DriverRecord GetModelByKeyid(Guid keyid);
+
+
+
+
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.Model/CY.Model.csproj b/CY_ECommercePlatform/CY.Model/CY.Model.csproj
index 8a08c56..70093ce 100644
--- a/CY_ECommercePlatform/CY.Model/CY.Model.csproj
+++ b/CY_ECommercePlatform/CY.Model/CY.Model.csproj
@@ -229,6 +229,7 @@
<Compile Include="OA\OA_Department.cs" />
<Compile Include="OA\OA_Document.cs" />
<Compile Include="OA\OA_DocumentDic.cs" />
+ <Compile Include="OA\OA_DriverRecord.cs" />
<Compile Include="OA\OA_FirmAccount.cs" />
<Compile Include="OA\OA_FirmAccountRecord.cs" />
<Compile Include="OA\OA_FirmAccountRecordExtend.cs" />
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs b/CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs
index f8e0a1a..9700251 100644
--- a/CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs
@@ -38,7 +38,13 @@
public Guid Keyid { get; set; }
public Guid? YujihuikuanKeyid { get; set; }
-
+
+
+ /// <summary>
+ /// 鍚堝苟閫佽揣鍗昳d
+ /// </summary>
+ public Guid? DeliverPlanPaicheid { get; set; }
+
/// <summary>
/// OrderId
/// </summary>
@@ -365,6 +371,13 @@
public string shoukuanshijian
+ {
+ get;
+ set;
+ }
+
+ //閫佽揣鍗曞浘鐗囩殑灞曠ず
+ public string SonghuodanTupian
{
get;
set;
@@ -768,7 +781,12 @@
this.TransferName = isChange ? MyConvert.ConvertToString(value) : TransferName;
theValue = this.TransferName;
}
-
+ else if ("DeliverPlanPaicheid".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 62)
+ {
+ this.DeliverPlanPaicheid = isChange ? MyConvert.ConvertToGuid(value) : DeliverPlanPaicheid;
+ theValue = this.DeliverPlanPaicheid;
+ }
+
return theValue;
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_DriverRecord.cs b/CY_ECommercePlatform/CY.Model/OA/OA_DriverRecord.cs
new file mode 100644
index 0000000..bfc6b23
--- /dev/null
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_DriverRecord.cs
@@ -0,0 +1,262 @@
+锘�/**
+* OA_CorporateClients.cs
+*
+* 鍔� 鑳斤細 N/A
+* 绫� 鍚嶏細 OA_CorporateClients
+*
+* Ver 鍙樻洿鏃ユ湡 璐熻矗浜� 鍙樻洿鍐呭
+* 鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�
+* V0.01 2013-4-2 14:27:43 N/A 鍒濈増
+*
+*
+*
+*
+*
+*
+*/
+
+using System;
+using CY.Infrastructure.Domain;
+using CY.Infrastructure.Common;
+
+namespace CY.Model
+{
+ /// <summary>
+ /// 鍗板埛鍙傛暟
+ /// </summary>
+ [Serializable]
+ public partial class OA_DriverRecord : IAggregateRoot
+ {
+
+ public OA_DriverRecord()
+ {
+ }
+ #region Model
+ /// <summary>
+ /// id
+ /// </summary>
+ public Guid Id { get; set; }
+
+ /// <summary>
+ /// 閲岀▼琛� 鍏噷
+ /// </summary>
+ public int Mileage { get; set; }
+
+ /// <summary>
+ /// 杞﹀喌 鏆傛椂涓嶈
+ /// </summary>
+ public string Condition { get; set; }
+
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ public string Remark { get; set; }
+
+ /// <summary>
+ /// 鏈璐ф儏鍐�
+ /// </summary>
+ public string EmptyCause { get; set; }
+
+
+
+
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ public DateTime CreatTime { get; set; }
+
+
+ /// <summary>
+ /// 鍒涘缓浜虹殑memberId
+ /// </summary>
+ public Guid? CreaterID { get; set; }
+
+
+ /// <summary>
+ /// 杞﹁締ID
+ /// </summary>
+ public int CarID { get; set; }
+ /// <summary>
+ /// 杞﹁締鍚嶇О
+ /// </summary>
+ public string CarName { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓浜�
+ /// </summary>
+ public string Creater { get; set; }
+
+ /// <summary>
+ /// 鎵撳崱绫诲瀷锛�0 浠ｈ〃鏈煡锛�1浠ｈ〃涓婄彮鍑鸿溅锛�2浠ｈ〃涓嬬彮 3 浠ｈ〃鑽夌
+ /// </summary>
+ public int? ClockType
+ {
+ get;
+ set;
+ }
+
+
+ /// <summary>
+ /// 鐘舵�佸悕绉�
+ /// </summary>
+ public string ClockTypeName
+ {
+ get
+ {
+ if (ClockType.HasValue)
+ {
+ if (ClockType.Value == 1)
+ {
+ return "涓婄彮";
+ }
+ else if (ClockType.Value == 2)
+ {
+ return "涓嬬彮";
+ }
+ else if (ClockType.Value == 3)
+ {
+ return "鑽夌";
+ }
+ else
+ {
+ return "鏈煡";
+ }
+
+ }
+ else
+ {
+ return "鏈煡";
+ }
+ }
+ }
+
+ /// <summary>
+ /// 閲岀▼鍥剧墖
+ /// </summary>
+ public string MileageImg
+ {
+ get;
+ set;
+ }
+ public string MileageImgName
+ {
+ get;
+ set;
+ }
+
+ public string CarConditionImg
+ {
+ get;
+ set;
+ }
+
+ public string ZhuangcheImg
+ {
+ get;
+ set;
+ }
+
+ /// <summary>
+ /// 杞﹀喌
+ /// </summary>
+ public string CarCondition
+ {
+ get;
+ set;
+ }
+
+ // 闄勪欢琛� 4鏄璐х収鐗� 5鏄溅鍐�
+
+
+ #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 ("Mileage".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 2)
+ {
+ this.Mileage = isChange ? MyConvert.ConvertToInt32(value).Value : Mileage;
+ theValue = this.Mileage;
+ }
+ else if ("Condition".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 3)
+ {
+ this.Condition = isChange ? MyConvert.ConvertToString(value) : Condition;
+ theValue = this.Condition;
+ }
+ else if ("Remark".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 4)
+ {
+ this.Remark = isChange ? MyConvert.ConvertToString(value) : Remark;
+ theValue = this.Remark;
+ }
+
+ else if ("EmptyCause".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 5)
+ {
+ this.EmptyCause = isChange ? MyConvert.ConvertToString(value) : EmptyCause;
+ theValue = this.EmptyCause;
+ }
+ else if ("CreatTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 6)
+ {
+ this.CreatTime = isChange ? MyConvert.ConvertToDateTime(value).Value : CreatTime;
+ theValue = this.CreatTime;
+ }
+ else if ("CreaterID".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 7)
+ {
+ this.CreaterID = isChange ? MyConvert.ConvertToGuid(value) : CreaterID;
+ theValue = this.CreaterID;
+ }
+ else if ("CarID".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 8)
+ {
+ this.CarID = isChange ? MyConvert.ConvertToInt32(value).Value : CarID;
+ theValue = this.CarID;
+ }
+ else if ("Creater".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 9)
+ {
+ this.Creater = isChange ? MyConvert.ConvertToString(value) : Creater;
+ theValue = this.Creater;
+ }
+ else if ("ClockType".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 10)
+ {
+ this.ClockType = isChange ? MyConvert.ConvertToInt32(value) : ClockType;
+ theValue = this.ClockType;
+ }
+ else if ("MileageImg".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 11)
+ {
+ this.MileageImg = isChange ? MyConvert.ConvertToString(value) : MileageImg;
+ theValue = this.MileageImg;
+ }
+ else if ("CarCondition".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 12)
+ {
+ this.CarCondition = isChange ? MyConvert.ConvertToString(value) : CarCondition;
+ theValue = this.CarCondition;
+ }
+ else if ("CarName".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 13)
+ {
+ this.CarName = isChange ? MyConvert.ConvertToString(value) : CarName;
+ theValue = this.CarName;
+ }
+
+
+
+ return theValue;
+ }
+
+ #endregion
+ }
+}
diff --git a/CY_ECommercePlatform/CY.SQLDAL/CY.SQLDAL.csproj b/CY_ECommercePlatform/CY.SQLDAL/CY.SQLDAL.csproj
index 432be83..8ab96bf 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/CY.SQLDAL.csproj
+++ b/CY_ECommercePlatform/CY.SQLDAL/CY.SQLDAL.csproj
@@ -184,9 +184,11 @@
<Compile Include="OA\OA_CuikuanjiluDAL.cs" />
<Compile Include="OA\OA_CustomerApplyDAL.cs" />
<Compile Include="OA\OA_DeliverPlanDAL.cs" />
+ <Compile Include="OA\OA_DeliverPlanPaicheDAL.cs" />
<Compile Include="OA\OA_DepartmentDAL.cs" />
<Compile Include="OA\OA_DocumentDAL.cs" />
<Compile Include="OA\OA_DocumentDicDAL.cs" />
+ <Compile Include="OA\OA_DriverRecordDAL.cs" />
<Compile Include="OA\OA_FukuanshenqingDAL.cs" />
<Compile Include="OA\OA_KaipiaoJineQuerenDAL.cs" />
<Compile Include="OA\OA_KaipiaonewcuishouDAL.cs" />
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_DeliverPlanDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_DeliverPlanDAL.cs
index 8e8a66c..2d6b62d 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_DeliverPlanDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_DeliverPlanDAL.cs
@@ -155,6 +155,16 @@
TransfersTime = new SqlParameter("@TransfersTime", DBNull.Value);
}
+ SqlParameter LastUpdateTime = null;
+ if (trueModel.LastUpdateTime.HasValue)
+ {
+ LastUpdateTime = new SqlParameter("@LastUpdateTime", trueModel.LastUpdateTime.Value);
+ }
+ else
+ {
+ LastUpdateTime = new SqlParameter("@LastUpdateTime", DBNull.Value);
+ }
+
IList<SqlParameter> sqlParms = new List<SqlParameter>()
{
@@ -171,7 +181,7 @@
new SqlParameter("@Creater",trueModel.Creater),
new SqlParameter("@CreateTime",trueModel.CreateTime),
new SqlParameter("@Updater",trueModel.Updater.HasValue?trueModel.Updater.Value:Guid.Empty),
- new SqlParameter("@LastUpdateTime",trueModel.LastUpdateTime.HasValue?trueModel.LastUpdateTime.Value:DateTime.MinValue),
+ LastUpdateTime,
new SqlParameter("@Sort",trueModel.Sort),
new SqlParameter("@DeliverTime",trueModel.DeliverTime),
new SqlParameter("@wentifankui",string.IsNullOrEmpty(trueModel.wentifankui)?"":trueModel.wentifankui),
@@ -189,6 +199,8 @@
new SqlParameter("@Deliveredstatus",trueModel.Deliveredstatus.HasValue?trueModel.Deliveredstatus.Value:0),
new SqlParameter("@TransferType",trueModel.TransferType.HasValue?trueModel.TransferType.Value:0),
new SqlParameter("@TransferName",string.IsNullOrEmpty(trueModel.TransferName)?"":trueModel.TransferName),
+ new SqlParameter("@DeliverPlanPaicheid", trueModel.DeliverPlanPaicheid.HasValue?trueModel.DeliverPlanPaicheid:Guid.Empty),
+
};
try
{
@@ -251,6 +263,16 @@
/// <summary>
+ /// 鍏ㄩ儴鏌ヨ
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.OA_DeliverPlan> GetModelByDeliverPlanPaicheid(Guid deliverPlanPaicheid)
+ {
+ return _dataBase.SelectModel<Model.OA_DeliverPlan>(" * ", " OA_DeliverPlan ", " DeliverPlanPaicheid = '" + deliverPlanPaicheid + "'") as IList<Model.OA_DeliverPlan>;//鎵ц鏌ヨ
+ }
+
+ /// <summary>
/// 鍒嗛〉鏌ヨ
/// </summary>
/// <param name="query"></param>
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_DeliverPlanPaicheDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_DeliverPlanPaicheDAL.cs
new file mode 100644
index 0000000..4f0a1a3
--- /dev/null
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_DeliverPlanPaicheDAL.cs
@@ -0,0 +1,337 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using CY.IDAL;
+using System.Data.SqlClient;
+using System.Data;
+using CY.Model;
+using System.Transactions;
+
+namespace CY.SQLDAL
+{
+ public class OA_DeliverPlanPaicheDAL : IOA_DeliverPlanPaicheDAL
+ {
+
+ private Database _dataBase = null;
+ #region 甯搁噺
+ /// <summary>
+ /// 鏌ヨ鐩爣
+ /// </summary>
+ const string SELECTTARGET = " t.* ";
+ /// <summary>
+ /// 鏌ヨ鏉ユ簮
+ /// </summary>
+ const string FROMSOUCEBEFORE = " ( select distinct od.*,d_Shifouwanjie.Name as TransferstatusName, " +
+ " od.CompanyName as BuyerName,eo.shuliang, os.Name as BusinessManager,od.Dizhi+' 鑱旂郴浜猴細'+od.Lianxiren+' 鐢佃瘽锛�'+od.Dianhua as DizhiLianxirenDianhua, " +
+ " ocar.[CarNumber] as CarName,oss.Name as DriverName " +
+ " from [OA_DeliverPlanPaiche] od left join [OA_CorporateClients] oe on oe.Keyid = od.[BuyerId] " +
+
+ " left join (select count(*) as shuliang,eo.DeliverPlanPaicheid from [OA_DeliverPlan] eo group by eo.DeliverPlanPaicheid ) eo on od.Keyid =eo.[DeliverPlanPaicheid] " + // eo.OrderState =4
+ // " inner join [OA_CustomerCommunications] oc on oe.Keyid = oc.Keyid " +
+ //" left join [OA_DeliverPlanPaiche] od on oe.Keyid = od.[BuyerId] and DATEDIFF(day,eo.[DeliveryTime], od.[DeliverTime])=0 " +
+ " left join [OA_Staff] os on od.BusinessManagerId = os.Keyid " +
+ " left join [OA_CarManage] ocar on od.[CarId] = ocar.Keyid " +
+ " left join [OA_Staff] oss on od.[DriverId] = oss.Keyid " +
+ " Left Join Sys_Dictionary as d_Shifouwanjie On(d_Shifouwanjie.DicType= '閫佽揣鍗曠Щ浜ょ姸鎬�' and od.[Transferstatus]= d_Shifouwanjie.MeanValue) where 0=0 ";
+ const string FROMSOUCEEND = ") as t ";
+ /// <summary>
+ /// 鍒嗛〉榛樿鎺掑簭瀛楁
+ /// </summary>
+ const string ORDERBY = " case when Sort is null then 1 else 0 end asc,Sort asc ";
+ #endregion
+ public OA_DeliverPlanPaicheDAL()
+ {
+ _dataBase = new Database();
+ }
+
+ /// <summary>
+ /// 鏂板
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public bool InserModel(Infrastructure.Domain.IAggregateRoot model)
+ {
+ Model.OA_DeliverPlan trueModel = model as Model.OA_DeliverPlan;
+ if (trueModel == null)
+ {
+ return false;
+ }
+ SqlParameter DeliveredTime = null;
+ if (trueModel.DeliveredTime.HasValue)
+ {
+ DeliveredTime = new SqlParameter("@DeliveredTime", trueModel.DeliveredTime.Value);
+ }
+ else
+ {
+ DeliveredTime = new SqlParameter("@DeliveredTime", DBNull.Value);
+ }
+
+ SqlParameter TransfersTime = null;
+ if (trueModel.TransfersTime.HasValue)
+ {
+ TransfersTime = new SqlParameter("@TransfersTime", trueModel.TransfersTime.Value);
+ }
+ else
+ {
+ TransfersTime = new SqlParameter("@TransfersTime", DBNull.Value);
+ }
+
+ IList<SqlParameter> sqlParms = new List<SqlParameter>()
+ {
+
+ new SqlParameter("@Keyid",trueModel.Keyid),
+ new SqlParameter("@FirmId",trueModel.FirmId),
+ new SqlParameter("@BuyerId",trueModel.BuyerId),
+ DeliveredTime,
+ new SqlParameter("@Zhuyishixiang",trueModel.Zhuyishixiang),
+ new SqlParameter("@Gongzuokaoping",trueModel.Gongzuokaoping),
+ new SqlParameter("@CarId",trueModel.CarId),
+ new SqlParameter("@DriverId",trueModel.DriverId),
+ new SqlParameter("@Transferstatus",trueModel.Transferstatus),
+ TransfersTime,
+ new SqlParameter("@Creater",trueModel.Creater),
+ new SqlParameter("@CreateTime",trueModel.CreateTime),
+ new SqlParameter("@Updater",trueModel.Updater),
+ new SqlParameter("@LastUpdateTime",trueModel.LastUpdateTime),
+ new SqlParameter("@Sort",trueModel.Sort),
+ new SqlParameter("@DeliverTime",trueModel.DeliverTime),
+ new SqlParameter("@wentifankui",trueModel.wentifankui),
+ new SqlParameter("@Yichangchuli",trueModel.Yichangchuli),
+ new SqlParameter("@Xingzhengzhuize",trueModel.Xingzhengzhuize),
+ new SqlParameter("@SellerOrderId",trueModel.SellerOrderId),
+ new SqlParameter("@Dianhua",trueModel.Dianhua),
+ new SqlParameter("@Dizhi",trueModel.Dizhi),
+ new SqlParameter("@Remark",trueModel.Remark),
+ new SqlParameter("@BusinessManagerId",trueModel.BusinessManagerId),
+ new SqlParameter("@Biddingcompany",trueModel.Biddingcompany),
+ new SqlParameter("@shifouDelivery",trueModel.shifouDelivery),
+ new SqlParameter("@Lianxiren",trueModel.Lianxiren),
+ new SqlParameter("@CompanyName",string.IsNullOrEmpty(trueModel.CompanyName)?"":trueModel.CompanyName),
+ new SqlParameter("@Deliveredstatus",trueModel.Deliveredstatus.HasValue?trueModel.Deliveredstatus.Value:0),
+ new SqlParameter("@TransferType",trueModel.TransferType.HasValue?trueModel.TransferType.Value:0),
+ new SqlParameter("@TransferName",string.IsNullOrEmpty(trueModel.TransferName)?"":trueModel.TransferName),
+ };
+ string sql = "Insert Into [OA_DeliverPlanPaiche] ([Keyid],[FirmId],[BuyerId],[DeliveredTime],[Zhuyishixiang],[Gongzuokaoping], [CarId], [DriverId],[Transferstatus], [TransfersTime], [Creater],[CreateTime],[Updater],[LastUpdateTime],[Sort],DeliverTime,wentifankui,Yichangchuli,Xingzhengzhuize,SellerOrderId,Dianhua,Dizhi,Remark,BusinessManagerId,Biddingcompany,shifouDelivery,Lianxiren,CompanyName,Deliveredstatus,TransferType,TransferName)"
+ + " Values ( @Keyid,@FirmId,@BuyerId,@DeliveredTime, @Zhuyishixiang,@Gongzuokaoping, @CarId, @DriverId, @Transferstatus, @TransfersTime, @Creater,@CreateTime,@Updater,@LastUpdateTime,@Sort,@DeliverTime,@wentifankui,@Yichangchuli,@Xingzhengzhuize,@SellerOrderId,@Dianhua,@Dizhi,@Remark,@BusinessManagerId,@Biddingcompany,@shifouDelivery,@Lianxiren,@CompanyName,@Deliveredstatus,@TransferType,@TransferName )";
+ try
+ {
+ _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ return true;
+ }
+
+ /// <summary>
+ /// 淇敼
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public bool UpdateModel(Infrastructure.Domain.IAggregateRoot model)
+ {
+ Model.OA_DeliverPlan trueModel = model as Model.OA_DeliverPlan;
+ if (trueModel == null)
+ {
+ return false;
+ }
+ SqlParameter DeliveredTime = null;
+ if (trueModel.DeliveredTime.HasValue)
+ {
+ DeliveredTime = new SqlParameter("@DeliveredTime", trueModel.DeliveredTime.Value);
+ }
+ else
+ {
+ DeliveredTime = new SqlParameter("@DeliveredTime", DBNull.Value);
+ }
+
+ SqlParameter TransfersTime = null;
+ if (trueModel.TransfersTime.HasValue)
+ {
+ TransfersTime = new SqlParameter("@TransfersTime", trueModel.TransfersTime.Value);
+ }
+ else
+ {
+ TransfersTime = new SqlParameter("@TransfersTime", DBNull.Value);
+ }
+
+ SqlParameter LastUpdateTime = null;
+ if (trueModel.LastUpdateTime.HasValue)
+ {
+ LastUpdateTime = new SqlParameter("@LastUpdateTime", trueModel.LastUpdateTime.Value);
+ }
+ else
+ {
+ LastUpdateTime = new SqlParameter("@LastUpdateTime", DBNull.Value);
+ }
+
+ IList<SqlParameter> sqlParms = new List<SqlParameter>()
+ {
+
+ new SqlParameter("@Keyid",trueModel.Keyid),
+ new SqlParameter("@FirmId",trueModel.FirmId),
+ new SqlParameter("@BuyerId",trueModel.BuyerId),
+ DeliveredTime,
+ new SqlParameter("@Zhuyishixiang",string.IsNullOrEmpty(trueModel.Zhuyishixiang)?"":trueModel.Zhuyishixiang ),
+ new SqlParameter("@Gongzuokaoping",string.IsNullOrEmpty(trueModel.Gongzuokaoping)?"":trueModel.Gongzuokaoping ),
+ new SqlParameter("@CarId",trueModel.CarId),
+ new SqlParameter("@DriverId",trueModel.DriverId),
+ new SqlParameter("@Transferstatus",trueModel.Transferstatus),
+ TransfersTime,
+ new SqlParameter("@Creater",trueModel.Creater),
+ new SqlParameter("@CreateTime",trueModel.CreateTime),
+ new SqlParameter("@Updater",trueModel.Updater.HasValue?trueModel.Updater.Value:Guid.Empty),
+ LastUpdateTime,
+ new SqlParameter("@Sort",trueModel.Sort),
+ new SqlParameter("@DeliverTime",trueModel.DeliverTime),
+ new SqlParameter("@wentifankui",string.IsNullOrEmpty(trueModel.wentifankui)?"":trueModel.wentifankui),
+ new SqlParameter("@Yichangchuli",string.IsNullOrEmpty(trueModel.Yichangchuli)?"":trueModel.Yichangchuli),
+ new SqlParameter("@Xingzhengzhuize",string.IsNullOrEmpty(trueModel.Xingzhengzhuize)?"":trueModel.Xingzhengzhuize),
+ new SqlParameter("@SellerOrderId",string.IsNullOrEmpty(trueModel.SellerOrderId)?"":trueModel.SellerOrderId),
+ new SqlParameter("@Dianhua",trueModel.Dianhua),
+ new SqlParameter("@Dizhi",trueModel.Dizhi),
+ new SqlParameter("@Remark",trueModel.Remark),
+ new SqlParameter("@BusinessManagerId",trueModel.BusinessManagerId),
+ new SqlParameter("@Biddingcompany",trueModel.Biddingcompany.HasValue?trueModel.Biddingcompany.Value:0),
+ new SqlParameter("@shifouDelivery",trueModel.shifouDelivery),
+ new SqlParameter("@Lianxiren",trueModel.Lianxiren),
+ new SqlParameter("@CompanyName",string.IsNullOrEmpty(trueModel.CompanyName)?"":trueModel.CompanyName),
+ new SqlParameter("@Deliveredstatus",trueModel.Deliveredstatus.HasValue?trueModel.Deliveredstatus.Value:0),
+ new SqlParameter("@TransferType",trueModel.TransferType.HasValue?trueModel.TransferType.Value:0),
+ new SqlParameter("@TransferName",string.IsNullOrEmpty(trueModel.TransferName)?"":trueModel.TransferName),
+
+ };
+ string sql = "Update OA_DeliverPlanPaiche Set [FirmId]=@FirmId,[BuyerId]=@BuyerId,[DeliveredTime]=@DeliveredTime,[Zhuyishixiang]=@Zhuyishixiang,Gongzuokaoping=@Gongzuokaoping, [CarId]=@CarId, [DriverId]=@DriverId,[Transferstatus]=@Transferstatus, [TransfersTime]=@TransfersTime, [Creater]=@Creater,[CreateTime]=@CreateTime,[Updater]=@Updater,[LastUpdateTime]=@LastUpdateTime,Sort=@Sort,DeliverTime=@DeliverTime,wentifankui=@wentifankui,Yichangchuli=@Yichangchuli,Xingzhengzhuize=@Xingzhengzhuize,SellerOrderId=@SellerOrderId,Dianhua=@Dianhua,Dizhi=@Dizhi,Remark=@Remark,BusinessManagerId=@BusinessManagerId,Biddingcompany=@Biddingcompany,shifouDelivery=@shifouDelivery,Lianxiren=@Lianxiren,CompanyName=@CompanyName,Deliveredstatus=@Deliveredstatus,TransferType=@TransferType,TransferName=@TransferName where [Keyid] =@Keyid ";
+
+ try
+ {
+ _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ return true;
+ }
+
+ /// <summary>
+ /// 鏍规嵁缂栧彿鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ public OA_DeliverPlan GetModelByKeyid(Guid? keyid, Guid? BuyerId, DateTime? DeliveryTime)
+ {
+ try
+ {
+ string condition = " BuyerId='" + BuyerId + "' and DATEDIFF(day,[DeliveredTime],'" + DeliveryTime + "')=0 ";
+ if (!keyid.Equals(Guid.Parse("00000000-0000-0000-0000-000000000000")))
+ {
+ condition = " Keyid='" + keyid + "'";
+ }
+
+ // return null;//閿欒鏁版嵁杩斾細绌�
+
+ IList<OA_DeliverPlan> result = _dataBase.SelectModel<OA_DeliverPlan>("*", "OA_DeliverPlanPaiche", condition) as IList<OA_DeliverPlan>;//鎵ц鏌ヨ
+
+ return (null == result || result.Count == 0) ? null : result[0];//杩斿洖缁撴灉
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
+
+ /// <summary>
+ /// 鍏ㄩ儴鏌ヨ
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.OA_DeliverPlan> SelectAllModel(Infrastructure.Query.Query query)
+ {
+ return _dataBase.SelectModel<Model.OA_DeliverPlan>(" * ", " OA_DeliverPlanPaiche ") as IList<Model.OA_DeliverPlan>;//鎵ц鏌ヨ
+ }
+
+ /// <summary>
+ /// 鍏ㄩ儴鏌ヨ
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.OA_DeliverPlan> GetModelByformid(Guid FirmId)
+ {
+ return _dataBase.SelectModel<Model.OA_DeliverPlan>(" * ", " OA_DeliverPlanPaiche ", " FirmId = '" + FirmId + "'") as IList<Model.OA_DeliverPlan>;//鎵ц鏌ヨ
+ }
+
+
+
+ /// <summary>
+ /// 鍏ㄩ儴鏌ヨ
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.OA_DeliverPlan> GetModelByDeliveredTime(Guid FirmId, DateTime DeliverTime)
+ {
+ return _dataBase.SelectModel<Model.OA_DeliverPlan>(" * ", " OA_DeliverPlanPaiche ", " FirmId = '" + FirmId + "' and DATEDIFF(day,[DeliverTime],'" + DeliverTime + "')=0 ") as IList<Model.OA_DeliverPlan>;//鎵ц鏌ヨ
+ }
+
+
+
+ /// <summary>
+ /// 鍒嗛〉鏌ヨ
+ /// </summary>
+ /// <param name="query"></param>
+ /// <param name="pagination"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.OA_DeliverPlan> SelectModelPage(Infrastructure.Query.Query query, Infrastructure.Query.Pagination pagination)
+ {
+ if (null == pagination || null == query || null == query.Criteria || 1 > query.Criteria.Count)
+ return null;
+ //query.Criteria 棣栦釜鍏冪礌蹇呴』鏄帓搴忓瓧娈碉紝鍏跺�间负缁撴灉鎺掑簭瀛楁
+
+ int maxParamIndex = query.Criteria.Count - 1;//鏈�澶х储寮�
+
+ string[] orderbys = new string[] { ORDERBY };
+ string resultOrderBy = "";//缁撴灉闆嗘帓搴忔柟寮�
+
+ if ("@orderBy".Equals(query.Criteria[maxParamIndex].PropertyName))
+ {
+ orderbys = string.Format("{0}", query.Criteria[maxParamIndex].Value).Split(',');
+ resultOrderBy = query.Criteria[maxParamIndex].Value.ToString();//= 1 == orderbys.Length ? resultOrderBy : orderbys[1];
+ }
+ string fromSouce = string.Format("{0}{1}{2}", FROMSOUCEBEFORE, query.Criteria[0].Value, FROMSOUCEEND);//鎷艰鏉′欢
+ return _dataBase.SelectModelPage<Model.OA_DeliverPlan>(pagination, SELECTTARGET, fromSouce, orderbys[0], resultOrderBy);
+ }
+
+ /// <summary>
+ /// 鍒犻櫎
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public bool DeleteModel(Infrastructure.Domain.IAggregateRoot model)
+ {
+ Model.OA_DeliverPlan trueModel = model as Model.OA_DeliverPlan;
+ if (trueModel == null)
+ {
+ return false;
+ }
+ IList<SqlParameter> sqlParms = new List<SqlParameter>()
+ {
+ new SqlParameter("@Keyid",trueModel.Keyid)
+ };
+ string sql = "Delete [OA_DeliverPlanPaiche] Where [Keyid] = @Keyid ";
+
+
+ try
+ {
+ _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ return true;
+ }
+ }
+}
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_DriverRecordDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_DriverRecordDAL.cs
new file mode 100644
index 0000000..086bb3d
--- /dev/null
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_DriverRecordDAL.cs
@@ -0,0 +1,160 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using CY.IDAL;
+using System.Data.SqlClient;
+using System.Data;
+using CY.Model;
+using System.Transactions;
+
+namespace CY.SQLDAL
+{
+ public class OA_DriverRecordDAL : IOA_DriverRecordDAL
+ {
+
+ private Database _dataBase = null;
+ #region 甯搁噺
+ /// <summary>
+ /// 鏌ヨ鐩爣
+ /// </summary>
+ const string SELECTTARGET = " t.* ";
+ /// <summary>
+ /// 鏌ヨ鏉ユ簮
+ /// </summary>
+ const string FROMSOUCEBEFORE = " ( select od.* , " +
+
+ " ocar.[CarNumber] as CarName " +
+ " from [OA_DriverRecord] od " +
+
+ " left join [OA_CarManage] ocar on od.[CarID] = ocar.Keyid " +
+
+ " where 0=0 ";
+ const string FROMSOUCEEND = ") as t ";
+ /// <summary>
+ /// 鍒嗛〉榛樿鎺掑簭瀛楁
+ /// </summary>
+ const string ORDERBY = " CreatTime desc ";
+ #endregion
+ public OA_DriverRecordDAL()
+ {
+ _dataBase = new Database();
+ }
+
+ /// <summary>
+ /// 鏂板
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public bool InserModel(Infrastructure.Domain.IAggregateRoot model)
+ {
+ Model.OA_DriverRecord trueModel = model as Model.OA_DriverRecord;
+ if (trueModel == null)
+ {
+ return false;
+ }
+
+ return true;
+ }
+
+ /// <summary>
+ /// 淇敼
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public bool UpdateModel(Infrastructure.Domain.IAggregateRoot model)
+ {
+ Model.OA_DriverRecord trueModel = model as Model.OA_DriverRecord;
+ if (trueModel == null)
+ {
+ return false;
+ }
+
+ return true;
+ }
+
+ /// <summary>
+ /// 鏍规嵁缂栧彿鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ public OA_DriverRecord GetModelByKeyid(Guid keyid)
+ {
+ try
+ {
+ string condition = " ";
+ if (!keyid.Equals(Guid.Parse("00000000-0000-0000-0000-000000000000")))
+ {
+ condition = " Keyid='" + keyid + "'";
+ }
+
+ // return null;//閿欒鏁版嵁杩斾細绌�
+
+ IList<OA_DriverRecord> result = _dataBase.SelectModel<OA_DriverRecord>("*", "OA_DriverRecord", condition) as IList<OA_DriverRecord>;//鎵ц鏌ヨ
+
+ return (null == result || result.Count == 0) ? null : result[0];//杩斿洖缁撴灉
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
+
+ /// <summary>
+ /// 鍏ㄩ儴鏌ヨ
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.OA_DriverRecord> SelectAllModel(Infrastructure.Query.Query query)
+ {
+ return _dataBase.SelectModel<Model.OA_DriverRecord>(" * ", " OA_DriverRecord ") as IList<Model.OA_DriverRecord>;//鎵ц鏌ヨ
+ }
+
+
+
+
+
+ /// <summary>
+ /// 鍒嗛〉鏌ヨ
+ /// </summary>
+ /// <param name="query"></param>
+ /// <param name="pagination"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.OA_DriverRecord> SelectModelPage(Infrastructure.Query.Query query, Infrastructure.Query.Pagination pagination)
+ {
+ if (null == pagination || null == query || null == query.Criteria || 1 > query.Criteria.Count)
+ return null;
+ //query.Criteria 棣栦釜鍏冪礌蹇呴』鏄帓搴忓瓧娈碉紝鍏跺�间负缁撴灉鎺掑簭瀛楁
+
+ int maxParamIndex = query.Criteria.Count - 1;//鏈�澶х储寮�
+
+ string[] orderbys = new string[] { ORDERBY };
+ string resultOrderBy = "";//缁撴灉闆嗘帓搴忔柟寮�
+
+ if ("@orderBy".Equals(query.Criteria[maxParamIndex].PropertyName))
+ {
+ orderbys = string.Format("{0}", query.Criteria[maxParamIndex].Value).Split(',');
+ resultOrderBy = query.Criteria[maxParamIndex].Value.ToString();//= 1 == orderbys.Length ? resultOrderBy : orderbys[1];
+ }
+ string fromSouce = string.Format("{0}{1}{2}", FROMSOUCEBEFORE, query.Criteria[0].Value, FROMSOUCEEND);//鎷艰鏉′欢
+ return _dataBase.SelectModelPage<Model.OA_DriverRecord>(pagination, SELECTTARGET, fromSouce, orderbys[0], resultOrderBy);
+ }
+
+ /// <summary>
+ /// 鍒犻櫎
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public bool DeleteModel(Infrastructure.Domain.IAggregateRoot model)
+ {
+ Model.OA_DriverRecord trueModel = model as Model.OA_DriverRecord;
+ if (trueModel == null)
+ {
+ return false;
+ }
+
+ return true;
+ }
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
index d39ebaf..830deba 100644
--- a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
+++ b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
@@ -1887,12 +1887,17 @@
<Content Include="Pages\business\Caigoufukuanshenqing.aspx" />
<Content Include="Pages\business\Baozhengjinfukuan.aspx" />
<Content Include="Pages\business\BaozhengjinCuishou.aspx" />
+ <Content Include="Pages\business\DeliverPlanDakaList.aspx" />
+ <Content Include="Pages\business\DeliverPlanPaicheEdit.aspx" />
<Content Include="Pages\business\DeliverPlanFujianShow.aspx" />
<Content Include="Pages\business\DeliverPlanLishiList.aspx" />
+ <Content Include="Pages\business\DeliverPlanPaicheList.aspx" />
+ <Content Include="Pages\business\DeliverPlanChehui.aspx" />
<Content Include="Pages\business\DeliverPlanYijiao.aspx" />
<Content Include="Pages\business\DeliverPlanPaiche.aspx" />
<Content Include="Pages\business\DeliverPlanShifou.aspx" />
<Content Include="Pages\business\DeliverPlanLishiPrint.aspx" />
+ <Content Include="Pages\business\DeliverPlanPaicheZhuyishixiang.aspx" />
<Content Include="Pages\business\OrderSonghuoanchiList.aspx" />
<Content Include="Pages\business\OrderUpLoadLiuyang.aspx" />
<Content Include="Pages\business\WaixieOrderPrint.aspx" />
@@ -3351,6 +3356,20 @@
<Compile Include="Pages\business\BaozhengjinCuishou.aspx.designer.cs">
<DependentUpon>BaozhengjinCuishou.aspx</DependentUpon>
</Compile>
+ <Compile Include="Pages\business\DeliverPlanDakaList.aspx.cs">
+ <DependentUpon>DeliverPlanDakaList.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\business\DeliverPlanDakaList.aspx.designer.cs">
+ <DependentUpon>DeliverPlanDakaList.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="Pages\business\DeliverPlanPaicheEdit.aspx.cs">
+ <DependentUpon>DeliverPlanPaicheEdit.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\business\DeliverPlanPaicheEdit.aspx.designer.cs">
+ <DependentUpon>DeliverPlanPaicheEdit.aspx</DependentUpon>
+ </Compile>
<Compile Include="Pages\business\DeliverPlanFujianShow.aspx.cs">
<DependentUpon>DeliverPlanFujianShow.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -3364,6 +3383,20 @@
</Compile>
<Compile Include="Pages\business\DeliverPlanLishiList.aspx.designer.cs">
<DependentUpon>DeliverPlanLishiList.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="Pages\business\DeliverPlanPaicheList.aspx.cs">
+ <DependentUpon>DeliverPlanPaicheList.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\business\DeliverPlanPaicheList.aspx.designer.cs">
+ <DependentUpon>DeliverPlanPaicheList.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="Pages\business\DeliverPlanChehui.aspx.cs">
+ <DependentUpon>DeliverPlanChehui.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\business\DeliverPlanChehui.aspx.designer.cs">
+ <DependentUpon>DeliverPlanChehui.aspx</DependentUpon>
</Compile>
<Compile Include="Pages\business\DeliverPlanYijiao.aspx.cs">
<DependentUpon>DeliverPlanYijiao.aspx</DependentUpon>
@@ -3393,6 +3426,13 @@
<Compile Include="Pages\business\DeliverPlanLishiPrint.aspx.designer.cs">
<DependentUpon>DeliverPlanLishiPrint.aspx</DependentUpon>
</Compile>
+ <Compile Include="Pages\business\DeliverPlanPaicheZhuyishixiang.aspx.cs">
+ <DependentUpon>DeliverPlanPaicheZhuyishixiang.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\business\DeliverPlanPaicheZhuyishixiang.aspx.designer.cs">
+ <DependentUpon>DeliverPlanPaicheZhuyishixiang.aspx</DependentUpon>
+ </Compile>
<Compile Include="Pages\business\OrderSonghuoanchiList.aspx.cs">
<DependentUpon>OrderSonghuoanchiList.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx
index 70c5c3f..e1b33b5 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx
@@ -327,7 +327,7 @@
<%#Eval("BusinessManagers")%>
</td>
<td>
- <%#Eval("Mobile")%>
+ <%#Eval("CompanyPhone")%>
</td>
<%-- <td class="case_email">
<%#Eval("Email")%>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverOrderPrint.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverOrderPrint.aspx.cs
index d90af40..7fbcf55 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverOrderPrint.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverOrderPrint.aspx.cs
@@ -114,8 +114,9 @@
+ this.spnRemark.InnerText = oA_DeliverPlan.Remark;
-
+
@@ -134,7 +135,11 @@
if (m_EC_AwbInfo != null)
{
- this.spnRemark.InnerText = m_EC_AwbInfo.Remark;
+ if (string.IsNullOrWhiteSpace(this.spnRemark.InnerText))
+ {
+ this.spnRemark.InnerText = m_EC_AwbInfo.Remark;
+ }
+
}
}
@@ -158,10 +163,7 @@
}
}
}
- else
- {
- this.spnRemark.InnerText = oA_DeliverPlan.Remark;
- }
+
rptData.DataSource = eC_OrderBasics;
rptData.DataBind();
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanChehui.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanChehui.aspx
new file mode 100644
index 0000000..29adb0d
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanChehui.aspx
@@ -0,0 +1,55 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DeliverPlanChehui.aspx.cs" Inherits="CY.WebForm.Pages.business.DeliverPlanChehui" %>
+
+<!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>
+
+
+
+
+ </table>
+
+
+
+ </form>
+
+</body>
+<script type="text/javascript" language="javascript">
+
+
+
+</script>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanChehui.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanChehui.aspx.cs
new file mode 100644
index 0000000..c3bf04a
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanChehui.aspx.cs
@@ -0,0 +1,153 @@
+锘�/**
+* 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;
+
+namespace CY.WebForm.Pages.business
+{
+ public partial class DeliverPlanChehui : BasePage
+ {
+
+ OA_DeliverPlanPaicheBLL _OA_DeliverPlanPaicheBLL = null;
+ OA_DeliverPlanBLL _OA_DeliverPlanBLL = null;
+
+
+ //鍒濆鍖�
+ public DeliverPlanChehui()
+ {
+
+ _OA_DeliverPlanPaicheBLL = new OA_DeliverPlanPaicheBLL();
+ _OA_DeliverPlanBLL = new OA_DeliverPlanBLL();
+
+ }
+
+ /// <summary>
+ /// 椤甸潰鍔犺浇浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ try
+ {
+ switch (Request["Target"])
+ {
+ case "GetCommunication":
+
+ break;
+ case "ReBindClients":
+
+ 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)
+ {
+
+
+
+
+
+
+
+
+
+
+ string ids = Request["ids"];
+ var deliverPlan = _OA_DeliverPlanPaicheBLL.GetModelByKeyid(ids.ToGuid2(), null, null);
+ if (deliverPlan.DeliveredTime.HasValue)
+ {
+ //鎿嶄綔鎴愬姛
+ JavaScript.MessageBox("宸茬粡閫佽揪锛屾棤娉曟挙鍥烇紒", this, true, true);
+ }
+ else
+ {
+ var sss = false;
+ sss = _OA_DeliverPlanPaicheBLL.DeleteModel(deliverPlan);
+
+ var oA_DeliverPlans = _OA_DeliverPlanBLL.GetModelByDeliverPlanPaicheid(deliverPlan.Keyid);
+
+ foreach (var oA_DeliverPlan in oA_DeliverPlans)
+ {
+ oA_DeliverPlan.DeliverPlanPaicheid = Guid.Empty;
+ oA_DeliverPlan.DriverId = 0;
+ oA_DeliverPlan.CarId = 0;
+ oA_DeliverPlan.Updater = CurrentUser.TrueMemberId;
+ oA_DeliverPlan.LastUpdateTime = DateTime.Now;
+ sss = _OA_DeliverPlanBLL.UpdateModel(oA_DeliverPlan);
+ }
+ JavaScript.MessageBox("鎿嶄綔鎴愬姛锛�", this, true, true);
+ }
+
+
+
+
+ }
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanChehui.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanChehui.aspx.designer.cs
new file mode 100644
index 0000000..4299db7
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanChehui.aspx.designer.cs
@@ -0,0 +1,44 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.business
+{
+
+
+ public partial class DeliverPlanChehui
+ {
+
+ /// <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;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanDakaList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanDakaList.aspx
new file mode 100644
index 0000000..9907d7c
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanDakaList.aspx
@@ -0,0 +1,508 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DeliverPlanDakaList.aspx.cs" Inherits="CY.WebForm.Pages.business.DeliverPlanDakaList" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head id="Head1" runat="server">
+ <title>璁㈠崟鍒楄〃</title>
+ <uc:cmshead id="CMSHead1" runat="server" />
+ <%-- <script src="../../js/business/Order.js" type="text/javascript"></script>--%>
+ <script type="text/javascript">
+ //宸ヤ綔鑰冭瘎
+ function View(Keyid, BuyerId, DeliverTime,Sort) {
+ //if (Keyid == '00000000-0000-0000-0000-000000000000') {
+ // alert("璇峰厛瀹夋帓閫佽揣锛�");
+ // return;
+ //}
+
+ top.Dialog.open({ URL: "/Pages/business/DeliverPlanSort.aspx?Keyid=" + Keyid + "&BuyerId=" + BuyerId + "&DeliverTime=" + DeliverTime + "&Sort=" + Sort, Title: "閫佽揣瀹夋帓鎺掑簭", Width: 300, Height: 300 });
+ }
+
+ //宸ヤ綔鑰冭瘎
+ function ViewZhuyishixiang(Keyid, BuyerId, DeliverTime) {
+ //if (Keyid == '00000000-0000-0000-0000-000000000000') {
+ // alert("璇峰厛瀹夋帓閫佽揣锛�");
+ // return;
+ //}
+
+ top.Dialog.open({ URL: "/Pages/business/DeliverPlanZhuyishixiang.aspx?Keyid=" + Keyid + "&BuyerId=" + BuyerId + "&DeliverTime=" + DeliverTime , Title: "閫佽揣瀹夋帓娉ㄦ剰浜嬮」", Width: 800, Height: 300 });
+ }
+
+ //宸ヤ綔鑰冭瘎
+ function ViewGongzuokaoping(Keyid, BuyerId, DeliverTime) {
+ //if (Keyid == '00000000-0000-0000-0000-000000000000') {
+ // alert("璇峰厛瀹夋帓閫佽揣锛�");
+ // return;
+ //}
+
+ top.Dialog.open({ URL: "/Pages/business/DeliverPlanGongzuokaoping.aspx?Keyid=" + Keyid + "&BuyerId=" + BuyerId + "&DeliverTime=" + DeliverTime , Title: "閫佽揣瀹夋帓宸ヤ綔鑰冭瘎", Width: 800, Height: 300 });
+ }
+
+
+ //閫佽揣瀹夋帓
+ function ToAddorder() {
+ top.Dialog.open({ URL: "/Pages/business/DeliverPlanEdit.aspx", Title: "鏂板閫佽揣鍗�", Width: 900, Height: 750 });
+ }
+
+ //閫佽揣瀹夋帓
+ function outAfterWorks(Keyid, BuyerId, DeliveredTime) {
+ top.Dialog.open({ URL: "/Pages/business/OrderProductionprogress.aspx?SellerOrderId=" + SellerOrderId + "&Keyid=" + Keyid + "&works=" + works, Title: works, Width: 300, Height: 300 });
+ }
+ //鎵撳嵃
+ function outAfterWorks(Keyid) {
+ if (Keyid == '00000000-0000-0000-0000-000000000000') {
+ alert("璇峰厛瀹夋帓閫佽揣锛�");
+ return;
+ }
+ top.Dialog.open({ URL: "/Pages/business/DeliverPlanPrint.aspx?Keyid=" + Keyid + "&DelayTime=2021-04-09", Title: "宸ヤ綔鑰冭瘎", Width: 1000, Height: 800 });
+ }
+
+ ///鎵归噺鍙楃悊
+ function ToAllAccept1() {
+
+ var ids = '';
+ var cks = $("input[name='ckId']:checked");
+ if (cks.length == 0) { alertMsg('娌℃湁閫変腑浠讳綍椤癸紒'); return; } else { }
+ var isCan = true;
+ var DeliverTime = '';
+ var BuyerId = '';
+
+
+
+ cks.each(
+ function () {
+ var ckVal = $(this).val();
+
+ var ckValJson = eval('(' + ckVal + ')');
+
+ ids = ids + ',' + ckValJson.id;
+ //orderShowIds = orderShowIds + ',' + ckValJson.ordershowId;
+
+ DeliverTime = DeliverTime + ',' + ckValJson.DeliverTime;
+ BuyerId = BuyerId + ',' + ckValJson.BuyerId;
+ }
+ );
+
+
+ if (!isCan) {
+ // alertMsg('璇烽�夋嫨鏈彈鐞嗙殑璁㈠崟锛�');
+ }
+ else {
+ if (ids != '') {
+ ids = ids.substring(1);
+ DeliverTime = DeliverTime.substring(1);
+ BuyerId = BuyerId.substring(1);
+ }
+
+ var msg = ('纭绉讳氦鍗曟嵁鍚�?') ;
+ top.Dialog.confirm(msg, function () {
+ DoAcceptAll(ids, DeliverTime, BuyerId);
+ });
+ }
+ }
+
+ /*
+鎵归噺澶勭悊鍙楃悊璁㈠崟
+*/
+ var DoAcceptAll = function (orderIds, DeliverTime, BuyerId) {
+ CallServer({ Target: "AcceptOrderAll", ids: orderIds, DeliverTimes: DeliverTime, BuyerIds: BuyerId }, function (data, textStatus) {
+ if ('1' == data) {
+ alertMsg('鎿嶄綔鎴愬姛锛�');
+ RefreshDIVOpener(); //鍏抽棴椤甸潰
+ } else {
+ alertMsg('-1' == data ? '绉讳氦鍗曟嵁澶辫触锛�' : '绉讳氦鍗曟嵁澶辫触锛�');
+ //dialog.close();
+ }
+ });
+ }
+
+
+ ///鎵归噺鍙楃悊
+ function ToAllAccept3() {
+
+ var ids = '';
+ var cks = $("input[name='ckId']:checked");
+ if (cks.length == 0) { alertMsg('娌℃湁閫変腑浠讳綍椤癸紒'); return; } else { }
+ var isCan = true;
+ var DeliverTime = '';
+ var BuyerId = '';
+
+ //var carid = $("#selCarIddo").val();
+ //var driverid = $("#selDriverIddo").val();
+
+ //if (carid == "") { alertMsg('璇烽�夋嫨杞﹁締锛�'); return; } else { }
+ //if (driverid == "") { alertMsg('璇烽�夋嫨椹鹃┒鍛橈紒'); return; } else { }
+
+ cks.each(
+ function () {
+ var ckVal = $(this).val();
+
+ var ckValJson = eval('(' + ckVal + ')');
+
+ ids = ids + ',' + ckValJson.id;
+ //orderShowIds = orderShowIds + ',' + ckValJson.ordershowId;
+
+ DeliverTime = DeliverTime + ',' + ckValJson.DeliverTime;
+ BuyerId = BuyerId + ',' + ckValJson.BuyerId;
+ }
+ );
+
+
+ if (!isCan) {
+ // alertMsg('璇烽�夋嫨鏈彈鐞嗙殑璁㈠崟锛�');
+ }
+ else {
+ if (ids != '') {
+ ids = ids.substring(1);
+ //DeliverTime = DeliverTime.substring(1);
+ //BuyerId = BuyerId.substring(1);
+ }
+
+ top.Dialog.open({ URL: "/Pages/business/DeliverPlanPaiche.aspx?ids=" + ids, Title: "瀹夋帓杞﹁締", Width: 600, Height: 300 });
+ }
+ }
+
+
+
+ ///鎵归噺鍙楃悊
+ function ToAllAccept4() {
+
+ var ids = '';
+ var cks = $("input[name='ckId']:checked");
+ if (cks.length == 0) { alertMsg('娌℃湁閫変腑浠讳綍椤癸紒'); return; } else { }
+ var isCan = true;
+ var DeliverTime = '';
+ var BuyerId = '';
+
+ //var carid = $("#selCarIddo").val();
+ //var driverid = $("#selDriverIddo").val();
+
+ //if (carid == "") { alertMsg('璇烽�夋嫨杞﹁締锛�'); return; } else { }
+ //if (driverid == "") { alertMsg('璇烽�夋嫨椹鹃┒鍛橈紒'); return; } else { }
+
+ cks.each(
+ function () {
+ var ckVal = $(this).val();
+
+ var ckValJson = eval('(' + ckVal + ')');
+
+ ids = ids + ',' + ckValJson.id;
+ //orderShowIds = orderShowIds + ',' + ckValJson.ordershowId;
+
+ DeliverTime = DeliverTime + ',' + ckValJson.DeliverTime;
+ BuyerId = BuyerId + ',' + ckValJson.BuyerId;
+ }
+ );
+
+
+ if (!isCan) {
+ // alertMsg('璇烽�夋嫨鏈彈鐞嗙殑璁㈠崟锛�');
+ }
+ else {
+ if (ids != '') {
+ ids = ids.substring(1);
+ //DeliverTime = DeliverTime.substring(1);
+ //BuyerId = BuyerId.substring(1);
+ }
+
+ top.Dialog.open({ URL: "/Pages/business/DeliverPlanYijiao.aspx?ids=" + ids, Title: "鍗曟嵁绉讳氦", Width: 600, Height: 300 });
+ }
+ }
+
+
+
+
+ ///鎵归噺鍙楃悊
+ function ToAllAccept2() {
+
+ var ids = '';
+ var cks = $("input[name='ckId']:checked");
+ if (cks.length == 0) { alertMsg('娌℃湁閫変腑浠讳綍椤癸紒'); return; } else { }
+ var isCan = true;
+ var DeliverTime = '';
+ var BuyerId = '';
+
+ var carid = $("#selCarIddo").val();
+ var driverid = $("#selDriverIddo").val();
+
+ if (carid == "") { alertMsg('璇烽�夋嫨杞﹁締锛�'); return; } else { }
+ if (driverid == "") { alertMsg('璇烽�夋嫨椹鹃┒鍛橈紒'); return; } else { }
+
+ cks.each(
+ function () {
+ var ckVal = $(this).val();
+
+ var ckValJson = eval('(' + ckVal + ')');
+
+ ids = ids + ',' + ckValJson.id;
+ //orderShowIds = orderShowIds + ',' + ckValJson.ordershowId;
+
+ DeliverTime = DeliverTime + ',' + ckValJson.DeliverTime;
+ BuyerId = BuyerId + ',' + ckValJson.BuyerId;
+ }
+ );
+
+
+ if (!isCan) {
+ // alertMsg('璇烽�夋嫨鏈彈鐞嗙殑璁㈠崟锛�');
+ }
+ else {
+ if (ids != '') {
+ ids = ids.substring(1);
+ DeliverTime = DeliverTime.substring(1);
+ BuyerId = BuyerId.substring(1);
+ }
+
+ var msg = ('纭娲捐溅鍚�?');
+ top.Dialog.confirm(msg, function () {
+ DoAcceptAll2(ids, DeliverTime, BuyerId, carid, driverid);
+ });
+ }
+ }
+
+ /*
+鎵归噺澶勭悊鍙楃悊璁㈠崟
+*/
+ var DoAcceptAll2 = function (orderIds, DeliverTime, BuyerId, carid, driverid) {
+ CallServer({ Target: "AcceptOrderAll2", ids: orderIds, DeliverTimes: DeliverTime, BuyerIds: BuyerId, Carid: carid, Driverid: driverid}, function (data, textStatus) {
+ if ('1' == data) {
+ alertMsg('鎿嶄綔鎴愬姛锛�');
+ RefreshDIVOpener(); //鍏抽棴椤甸潰
+ } else {
+ alertMsg('-1' == data ? '娲捐溅澶辫触锛�' : '娲捐溅澶辫触锛�');
+ //dialog.close();
+ }
+ });
+ }
+
+
+ /*
+鎵撳嵃閫佽揣鍗�
+*/
+ function ToPrintDriverorder(DriverId) {
+
+ OpenWindowByUrl('/Pages/business/DeliverOrderPrint.aspx?deliverorderId=' + DriverId, '', '');
+ }
+
+
+
+
+ //缁存姢
+ function onViewuplod(keyid, AttachmentType) {
+ var l = (screen.availWidth - 500) / 2;
+ var t = (screen.availHeight - 300) / 2;
+ // window.open({ URL: "/Pages/business/CorporateClientsUpLoadContract.aspx?Keyid=" + keyid, Title: "鏌ョ湅鍚堝悓", Width: 900, Height: 750 });
+ window.open('/Pages/business/DeliverPlanFujianShow.aspx?Keyid=' + keyid + '&AttachmentType=' + AttachmentType, '_blank', 'height=750,width=900,top=' + t + ',left=' + l + ',toolbar=no,menubar=no,scrollbars=no,resizable=no,location=no,status=no');
+ }
+
+ /*
+鎵撳嵃閫佽揣鍗�
+*/
+ function ToPrintdelev() {
+ var DeliverTimestart = $("#txtDeliverTimestart").val();
+ var DeliverTimeend = $("#txtDeliverTimeend").val();
+ var CarId = $("#selCarId").val();
+ var DriverId = $("#selDriverId").val();
+ // OpenWindowByUrl();
+ //OpenWindowByUrl('/Pages/business/DeliverPlanPrint.aspx?DeliverTime=' + DeliveryTime + '&CarId=' + CarId + '&DriverId=' + DriverId, '', '');
+ OpenWindowByUrl('/Pages/business/DeliverPlanLishiPrint.aspx?DeliverTimestart=' + DeliverTimestart + '&DeliverTimeend=' + DeliverTimeend + '&CarId=' + CarId + '&DriverId=' + DriverId, '', '');
+ }
+ </script>
+ <style type="text/css">
+ .tableStyleXS th { padding: 1px 0 1px 3px; background-image:none; border-bottom:1px solid #CCC; }
+ .tableStyleXS td { padding: 1px 0 1px 3px; }
+ .TableNewStyle select { width: 80px; }
+ .td_hide span { text-decoration: default; display: none; text-align: center; }
+ span.hand_no { cursor: default; display: block; font-size: 12px; }
+ span.hand_no:hover { text-decoration: none; }
+ span.hand_yes { cursor: pointer; display: block; font-size: 12px; }
+ .td_hide { cursor: pointer; }
+ </style>
+</head>
+<body>
+ <form id="form1" runat="server">
+ <div id="scrollContent" style="width: auto;">
+ <div class="box1">
+ <table class="TableNewStyle" style="width: 100%;">
+ <tr>
+
+
+
+
+
+ <td style="width:5%" >
+
+ </td>
+ <td style="width:15%">
+
+ </td> <td style="width:5%" >
+
+ </td>
+ <td style="width:15%">
+
+ </td> <td style="width:5%" >
+
+ </td>
+ <td style="width:15%">
+
+ </td>
+ </tr>
+ <tr>
+ <td class="ali03">
+ 鎵撳崱鏃堕棿锛�
+ </td>
+
+ <td >
+ <input id="txtCreatTimestart" type="text" runat="server" class='date w80px' maxlength='10' />-<input id="txtCreatTimeend" type="text" runat="server" class='date w80px' maxlength='10' />
+ </td>
+ <td class="ali03">
+ 鎵撳崱绫诲瀷锛�
+ </td>
+ <td >
+ <select keepdefaultstyle='true' id='selClockType' runat="server" datatextfield='CarNumber' datavaluefield='Keyid'>
+ <option value="">璇烽�夋嫨</option>
+ <option value="1">涓婄彮</option>
+ <option value="2">涓嬬彮</option>
+ <option value="3">鑽夌</option>
+ </select>
+ </td>
+ <td class="ali03">
+ 杞﹁締锛�
+ </td>
+ <td >
+ <select keepdefaultstyle='true' id='selCarId' runat="server" datatextfield='CarNumber' datavaluefield='Keyid'>
+ </select>
+ </td>
+ <td class="ali03" >
+ 椹鹃┒鍛橈細
+ </td>
+ <td >
+ <input id='txtCreater' runat="server" maxlength='50' />
+
+ </td>
+ </tr>
+
+ <tr>
+
+
+
+ <td colspan="8">
+
+ <asp:button id="btn_Search" text="鏌ヨ" runat="server" padding="0px" OnClick="btn_Search_Click" /> <input type="button" value='閲嶇疆' onclick='document.body.innerHTML="";window.location=window.location;' />
+
+
+
+
+ </td>
+ </tr>
+
+
+ </table>
+ </div>
+
+
+ <div clear="fl">
+ <table class="tableStyle tableStyleXS" useclick="false" usecheckbox="true" sortmode="false">
+ <thead>
+ <tr>
+
+ <th width="25">
+ 椤哄簭
+ </th>
+ <th width="60">
+ 杞﹁締
+ </th>
+ <th width="40">
+ 椹鹃┒鍛�
+ </th>
+ <th width="85">
+ 鎵撳崱鏃堕棿
+ </th>
+ <th width="60">
+ 鎵撳崱绫诲瀷
+ </th>
+ <th style="text-align: center;"width="200">
+ 鏈璐ф儏鍐�
+ </th>
+ <th style="text-align: center;"width="200">
+ 杞﹀喌
+ </th>
+ <th style="text-align: center;"width="200">
+ 澶囨敞
+ </th>
+ <th width="60">
+ 閲岀▼(鍏噷)
+ </th>
+ <th width="60">
+ 閲岀▼鍥剧墖
+ </th>
+ <th width="60">
+ 瑁呰揣鍥剧墖
+ </th>
+ <th width="60">
+ 杞﹀喌鍥剧墖
+ </th>
+
+
+
+ </tr>
+ </thead>
+ <tbody>
+ <asp:repeater id="RepClientList" runat="server">
+ <itemtemplate>
+ <tr>
+
+
+ <td>
+ <%#Container.ItemIndex + (UCPager1.PageSize *( UCPager1.PageIndex-1)+1)%>
+ </td>
+ <td>
+ <%#Eval("CarName")%>
+ </td>
+ <td>
+ <%#Eval("Creater")%>
+ </td>
+ <td>
+ <%#Eval("CreatTime", "{0:yyyy-MM-dd HH:mm:dd}")%>
+ </td>
+ <td>
+ <%#Eval("ClockTypeName")%>
+ </td>
+ <td>
+ <%#Eval("EmptyCause")%>
+ </td>
+
+ <td>
+ <%#Eval("CarCondition")%>
+ </td>
+ <td>
+ <%#Eval("Remark")%>
+ </td>
+ <td>
+ <%#Eval("Mileage")%>
+ </td>
+ <td>
+ <a title='閲岀▼鍥剧墖' class='a_under' href="<%#Eval("MileageImg").ToString() %>" target="view_window" > <%#Eval("MileageImgName")%> </a>
+ </td>
+ <td>
+ <a href='javascript:void(0)' title='瑁呰揣鍥剧墖' class='a_under' onclick='onViewuplod("<%#Eval("Id")%>","4")'> <%#Eval("ZhuangcheImg")%> </a>
+ </td>
+ <td>
+ <a href='javascript:void(0)' title='杞﹀喌鍥剧墖' class='a_under' onclick='onViewuplod("<%#Eval("Id")%>","5")'> <%#Eval("CarConditionImg")%> </a>
+ </td>
+
+
+
+
+ </tr>
+ </itemtemplate>
+ </asp:repeater>
+
+ </tbody>
+ </table>
+ <uc:ucpager id="UCPager1" runat="server" />
+ </div>
+ </div>
+ </form>
+</body>
+</html>
+
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanDakaList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanDakaList.aspx.cs
new file mode 100644
index 0000000..2789512
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanDakaList.aspx.cs
@@ -0,0 +1,236 @@
+锘縰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.Model;
+using CY.Infrastructure.Query;
+using CY.Infrastructure.Common;
+using CY.BLL.Sys;
+using CY.BLL.OA;
+using CY.BLL.EC;
+using CY.BLL.Inquiry;
+using CY.Model.Inquiry;
+using System.Drawing;
+using CY.Model.OA;
+using CY.SQLDAL;
+using System.Data.SqlClient;
+using CY.Infrastructure.Logging;
+
+namespace CY.WebForm.Pages.business
+{
+ public partial class DeliverPlanDakaList : BasePage
+ {
+
+ OA_DriverRecordBLL _oA_DriverRecordBLL = null;
+
+ OA_CarManageBll _OA_CarManageBll = null;
+
+
+
+ //鍒濆鍖�
+ public DeliverPlanDakaList()
+ {
+
+ _oA_DriverRecordBLL = new OA_DriverRecordBLL();
+
+ _OA_CarManageBll = new OA_CarManageBll();
+
+ }
+
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ UCPager1.AspNetPager.PageChanged += AspNetPager1_PageChanged;
+ if (!IsPostBack)
+ {
+
+
+
+ switch (Request["Target"])
+ {
+
+ case "AcceptOrderAll":
+
+ break;
+ case "AcceptOrderAll2":
+
+ break;
+ default:
+ InitialSelectData();
+ BindList();
+ return;
+ }
+ Response.End();
+ }
+ }
+
+
+ //鍔犺浇鏌ヨ鏉′欢
+ protected void InitialSelectData()
+ {
+
+
+ this.selCarId.DataSource = _OA_CarManageBll.SelectListByFirmId(CurrentUser.MemberId);
+ this.selCarId.DataTextField = "CarNumber";
+ this.selCarId.DataValueField = "Keyid";
+ this.selCarId.DataBind();
+ this.selCarId.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+
+
+ this.txtCreatTimestart.Value = DateTime.Now.ToString("yyyy-MM-dd");
+ this.txtCreatTimeend.Value = DateTime.Now.ToString("yyyy-MM-dd");
+
+ }
+
+ //鍒嗛〉浜嬩欢
+ protected void AspNetPager1_PageChanged(object src, EventArgs e)
+ {
+ BindList();
+ }
+
+ //鏌ヨ浜嬩欢
+ protected void btn_Search_Click(object sender, EventArgs e)
+ {
+ BindList();
+ }
+
+
+ //缁戝畾鍒楄〃
+ private void BindList()
+ {
+
+
+
+
+
+
+ Pagination pa = new Pagination();
+ pa.PageSize = UCPager1.AspNetPager.PageSize;
+ pa.PageIndex = UCPager1.AspNetPager.CurrentPageIndex;
+
+ IEnumerable<OA_DriverRecord> oA_DriverRecords = _oA_DriverRecordBLL.SelectModelPage(pa,
+ this.txtCreatTimestart.Value,
+ this.txtCreatTimeend.Value,
+ this.selCarId.Value,
+ this.txtCreater.Value,
+ this.selClockType.Value
+ );
+
+ Database DC = new Database();
+
+ try
+ {
+ List<OA_CorporateClientsContract> fileDataList = null;
+ foreach (var oA_DriverRecord in oA_DriverRecords)
+ {
+ if (string.IsNullOrEmpty(oA_DriverRecord.MileageImg))
+ {
+ oA_DriverRecord.MileageImgName = "";
+ }
+ else
+ {
+ oA_DriverRecord.MileageImgName = "<img src=\"" + oA_DriverRecord.MileageImg + "\" width=\"20\" height=\"20\" >";
+ }
+
+
+
+
+
+ string sqlStr = string.Format(@" select * from [dbo].[OA_attachment] where [OA_Id]='{0}' and [AttachmentType]=4 order by [CreateTime] ", oA_DriverRecord.Id);
+
+ SqlCommand myCmd = new SqlCommand(sqlStr, DC.Connection);
+ //SqlDataAdapter myDa = new SqlDataAdapter(myCmd);
+ var a = myCmd.ExecuteReader();
+ //myDa.Dispose();
+ fileDataList = new List<OA_CorporateClientsContract>();
+ OA_CorporateClientsContract Contract;
+ var i = 1;
+ while (a.Read())
+ { //娉ㄦ剰濡備綍灏嗘瘡娆¤鍙栧埌鐨勮褰曟坊鍔犲埌listbox1涓紙鍥犱负绗竴娆″仛鏃跺嚭閿欎簡锛屽樋鍢匡級
+ Contract = new OA_CorporateClientsContract();
+ // Contract.Keyid = a.GetInt32(0);
+ //Contract.CorporateClientsid = a.GetGuid(1);
+ //Contract.CorporateClientsName = a.GetString(4);
+ Contract.FileName = a[4].ToString();
+ Contract.PageCode = i;
+ Contract.FilePath = a.GetString(2);
+ // Contract.Remark = a.GetString(6);
+ i += 1;
+
+ fileDataList.Add(Contract);
+ }
+ a.Close(); //鍏抽棴sqldatareader
+
+ if (fileDataList.Count > 0)
+ {
+ oA_DriverRecord.ZhuangcheImg = "<img src=\"" + fileDataList[0].FilePath + "\" width=\"20\" height=\"20\" >";
+ }
+ else
+ {
+ oA_DriverRecord.ZhuangcheImg = "";
+ }
+
+
+
+
+ sqlStr = string.Format(@" select * from [dbo].[OA_attachment] where [OA_Id]='{0}' and [AttachmentType]=5 order by [CreateTime] ", oA_DriverRecord.Id);
+
+ myCmd = new SqlCommand(sqlStr, DC.Connection);
+ //SqlDataAdapter myDa = new SqlDataAdapter(myCmd);
+ a = myCmd.ExecuteReader();
+ //myDa.Dispose();
+ fileDataList = new List<OA_CorporateClientsContract>();
+ i = 1;
+ while (a.Read())
+ { //娉ㄦ剰濡備綍灏嗘瘡娆¤鍙栧埌鐨勮褰曟坊鍔犲埌listbox1涓紙鍥犱负绗竴娆″仛鏃跺嚭閿欎簡锛屽樋鍢匡級
+ Contract = new OA_CorporateClientsContract();
+ // Contract.Keyid = a.GetInt32(0);
+ //Contract.CorporateClientsid = a.GetGuid(1);
+ //Contract.CorporateClientsName = a.GetString(4);
+ Contract.FileName = a[4].ToString();
+ Contract.PageCode = i;
+ Contract.FilePath = a.GetString(2);
+ // Contract.Remark = a.GetString(6);
+ i += 1;
+
+ fileDataList.Add(Contract);
+ }
+ a.Close(); //鍏抽棴sqldatareader
+
+ if (fileDataList.Count > 0)
+ {
+ oA_DriverRecord.CarConditionImg = "<img src=\"" + fileDataList[0].FilePath + "\" width=\"20\" height=\"20\" >";
+ }
+ else
+ {
+ oA_DriverRecord.CarConditionImg = "";
+ }
+
+
+ }
+ }
+ catch (Exception ee)
+ {
+ new Log4NetAdapter().Log("鏌ユ壘閫佽揣鍗曞浘鐗囧嚭閿欙細" + ee.Message);
+
+ }
+ finally
+ {
+ if (DC.Connection.State != System.Data.ConnectionState.Closed)
+ DC.Connection.Close();
+ }
+
+
+ this.RepClientList.DataSource = oA_DriverRecords;
+ this.RepClientList.DataBind();
+ UCPager1.AspNetPager.RecordCount = pa.RecordCount;
+ }
+
+
+
+
+
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanDakaList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanDakaList.aspx.designer.cs
new file mode 100644
index 0000000..12ba3a4
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanDakaList.aspx.designer.cs
@@ -0,0 +1,116 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.business
+{
+
+
+ public partial class DeliverPlanDakaList
+ {
+
+ /// <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>
+ /// txtCreatTimestart 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtCreatTimestart;
+
+ /// <summary>
+ /// txtCreatTimeend 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtCreatTimeend;
+
+ /// <summary>
+ /// selClockType 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selClockType;
+
+ /// <summary>
+ /// selCarId 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selCarId;
+
+ /// <summary>
+ /// txtCreater 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtCreater;
+
+ /// <summary>
+ /// btn_Search 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button btn_Search;
+
+ /// <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/DeliverPlanEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanEdit.aspx
index c5ddf2f..44e1b32 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanEdit.aspx
@@ -148,7 +148,7 @@
鏀惰揣鍗曚綅锛�
</td>
<td align="left">
- <input id='txtCompanyName' runat="server" maxlength="200" class='Sreq' />
+ <input id='txtCompanyName' runat="server" maxlength="200" class='Sreq' style="width:200px;" />
</td>
</tr>
<tr>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanEdit.aspx.cs
index c653c04..1cf2cda 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanEdit.aspx.cs
@@ -95,9 +95,10 @@
this.selBuyerId.DataBind();
this.selBuyerId.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
-
-
+ this.txtDeliverTime.Value = DateTime.Now.AddDays(1).ToString("yyyy-MM-dd");
+
+
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanFujianShow.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanFujianShow.aspx.cs
index 1145e72..4456963 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanFujianShow.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanFujianShow.aspx.cs
@@ -30,13 +30,15 @@
Guid Keyid = Request["Keyid"].ToGuid2();
+ string AttachmentType = Request["AttachmentType"];
+
if (Keyid == null)
{
JavaScript.MessageBox("鏈壘鍒拌瀹㈡埛", this, false, false);
return;
}
Database DC = new Database();
- string sqlStr = string.Format(@" select * from [dbo].[OA_attachment] where [OA_Id]='{0}' and [AttachmentType]=3 order by [CreateTime] ", Keyid);
+ string sqlStr = string.Format(@" select * from [dbo].[OA_attachment] where [OA_Id]='{0}' and [AttachmentType]={1} order by [CreateTime] ", Keyid, AttachmentType);
int count = 0;
try
{
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanGongzuokaoping.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanGongzuokaoping.aspx.cs
index 83101f8..b339dde 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanGongzuokaoping.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanGongzuokaoping.aspx.cs
@@ -17,12 +17,12 @@
{
public partial class DeliverPlanGongzuokaoping : BasePage
{
- OA_DeliverPlanBLL oA_DeliverPlanBLL = null;
+ OA_DeliverPlanPaicheBLL oA_DeliverPlanBLL = null;
public DeliverPlanGongzuokaoping()
{
- oA_DeliverPlanBLL = new OA_DeliverPlanBLL();
+ oA_DeliverPlanBLL = new OA_DeliverPlanPaicheBLL();
}
protected void Page_Load(object sender, EventArgs e)
@@ -96,6 +96,8 @@
else
{
oA_DeliverPlan.Gongzuokaoping = Gongzuokaoping;
+ oA_DeliverPlan.Updater = CurrentUser.TrueMemberId;
+ oA_DeliverPlan.LastUpdateTime = DateTime.Now;
result = oA_DeliverPlanBLL.UpdateModel(oA_DeliverPlan);
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx
index 9233c2b..3ea3c20 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx
@@ -300,12 +300,13 @@
function ToPrintdelev() {
var DeliveryTime = $("#txtDeliveryTime").val();
var CarId = $("#selCarId").val();
- var DriverId = $("#selDriverId").val();
+ var DriverId = "";
var CustormerName = $("#txtCustormerName").val();
var BusinessManager = $("#selBusinessManager").val();
+ var Paiche = $("#selPaiche").val();
// OpenWindowByUrl();
- OpenWindowByUrl('/Pages/business/DeliverPlanPrint.aspx?DeliverTime=' + DeliveryTime + '&CarId=' + CarId + '&DriverId=' + DriverId + '&CustormerName=' + CustormerName + '&BusinessManager=' + BusinessManager, '', '');
+ OpenWindowByUrl('/Pages/business/DeliverPlanPrint.aspx?DeliverTime=' + DeliveryTime + '&CarId=' + CarId + '&DriverId=' + DriverId + '&CustormerName=' + CustormerName + '&BusinessManager=' + BusinessManager + '&Paiche=' + Paiche, '', '');
}
</script>
<style type="text/css">
@@ -388,13 +389,7 @@
<select keepdefaultstyle='true' id='selCarId' runat="server" datatextfield='CarNumber' datavaluefield='Keyid'>
</select>
</td>
- <td class="ali03" >
- 椹鹃┒鍛橈細
- </td>
- <td >
- <select keepdefaultstyle='true' id='selDriverId' runat="server" datatextfield='Name' datavaluefield='Keyid'>
- </select>
- </td>
+
<td class="ali03">
瀹㈡埛鍗曚綅锛�
@@ -402,7 +397,13 @@
<td>
<input id='txtCustormerName' runat="server" maxlength='50' />
</td>
-
+ <td class="ali03">
+ 涓氬姟缁忕悊锛�
+ </td>
+ <td>
+ <select keepdefaultstyle='true' id='selBusinessManager' runat="server" datatextfield='Name' datavaluefield='Keyid'>
+ </select>
+ </td>
</tr>
<tr>
@@ -421,11 +422,14 @@
<select keepdefaultstyle='true' id='selDriverIddo' runat="server" datatextfield='Name' datavaluefield='Keyid'>
</select>
</td>--%>
- <td class="ali03">
- 涓氬姟缁忕悊锛�
+ <td class="ali03" >
+ 鏄惁娲捐溅锛�
</td>
- <td>
- <select keepdefaultstyle='true' id='selBusinessManager' runat="server" datatextfield='Name' datavaluefield='Keyid'>
+ <td >
+ <select keepdefaultstyle='true' id='selPaiche' runat="server" datatextfield='Name' datavaluefield='Keyid'>
+ <option value="">鍏ㄩ儴</option>
+ <option value="1">鏄�</option>
+ <option value="2">鍚�</option>
</select>
</td>
<td colspan="9">
@@ -514,10 +518,10 @@
</th>
<%-- <th width="60">
杞﹁締
- </th>--%>
+ </th>
<th width="60">
椹鹃┒鍛�
- </th>
+ </th>--%>
<%-- <th width="200">
闂鍙嶉 </th>
--%>
@@ -555,7 +559,8 @@
</td>
<td>
- <a href='javascript:void(0)' title='鐐瑰嚮淇敼鎺掑簭' class='a_under' onclick='View("<%#Eval("Keyid")%>","<%#Eval("BuyerId")%>","<%#Eval("DeliverTime", "{0:yyyy-MM-dd}")%>","<%#Eval("Sort")%>")'> <%#Eval("Sort")==null?"淇敼鎺掑簭":Eval("Sort")%> </a>
+ <%-- <a href='javascript:void(0)' title='鐐瑰嚮淇敼鎺掑簭' class='a_under' onclick='View("<%#Eval("Keyid")%>","<%#Eval("BuyerId")%>","<%#Eval("DeliverTime", "{0:yyyy-MM-dd}")%>","<%#Eval("Sort")%>")'> <%#Eval("Sort")==null?"淇敼鎺掑簭":Eval("Sort")%> </a> --%>
+ <%#Container.ItemIndex + (UCPager1.PageSize *( UCPager1.PageIndex-1)+1)%>
</td>
<td>
<%#Eval("SellerOrderId")%>
@@ -581,10 +586,10 @@
</td>
<%--<td>
<%#Eval("CarName")%>
- </td>--%>
+ </td>
<td>
<%#Eval("DriverName")%>
- </td>
+ </td>--%>
<%-- <td>
<%#Eval("wentifankui")%>
</td>--%>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.cs
index 85f920b..f274868 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.cs
@@ -66,11 +66,11 @@
//鍔犺浇鏌ヨ鏉′欢
protected void InitialSelectData()
{
- this.selDriverId.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, null, null).Where(x => x.BF_IsDriver == true);//.Where(x => x.SM_Post.Equals("椹鹃┒鍛�")) ;
- this.selDriverId.DataTextField = "Name";
- this.selDriverId.DataValueField = "Keyid";
- this.selDriverId.DataBind();
- this.selDriverId.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+ //this.selDriverId.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, null, null).Where(x => x.BF_IsDriver == true);//.Where(x => x.SM_Post.Equals("椹鹃┒鍛�")) ;
+ //this.selDriverId.DataTextField = "Name";
+ //this.selDriverId.DataValueField = "Keyid";
+ //this.selDriverId.DataBind();
+ //this.selDriverId.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
this.selCarId.DataSource = _OA_CarManageBll.SelectListByFirmId(CurrentUser.MemberId);
this.selCarId.DataTextField = "CarNumber";
@@ -84,6 +84,8 @@
this.selBusinessManager.DataValueField = "Keyid";
this.selBusinessManager.DataBind();
this.selBusinessManager.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+
+ this.selPaiche.Value = "2";
//this.selDriverIddo.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, null, null).Where(x => x.BF_IsDriver == true);//.Where(x => x.SM_Post.Equals("椹鹃┒鍛�"));
@@ -303,10 +305,10 @@
CurrentUser.MemberId,
this.txtDeliveryTime.Value,
this.selCarId.Value,
- this.selDriverId.Value,
+ "",
"",
this.txtCustormerName.Value.Trim(),
- this.selBusinessManager.Value
+ this.selBusinessManager.Value,this.selPaiche.Value
);
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.designer.cs
index 741aacc..4fa2f3b 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.designer.cs
@@ -132,15 +132,6 @@
protected global::System.Web.UI.HtmlControls.HtmlSelect selCarId;
/// <summary>
- /// selDriverId 鎺т欢銆�
- /// </summary>
- /// <remarks>
- /// 鑷姩鐢熸垚鐨勫瓧娈点��
- /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
- /// </remarks>
- protected global::System.Web.UI.HtmlControls.HtmlSelect selDriverId;
-
- /// <summary>
/// txtCustormerName 鎺т欢銆�
/// </summary>
/// <remarks>
@@ -159,6 +150,15 @@
protected global::System.Web.UI.HtmlControls.HtmlSelect selBusinessManager;
/// <summary>
+ /// selPaiche 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selPaiche;
+
+ /// <summary>
/// btn_Search 鎺т欢銆�
/// </summary>
/// <remarks>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaiche.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaiche.aspx
index cc040d8..21a5f76 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaiche.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaiche.aspx
@@ -1,90 +1,98 @@
-锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DeliverPlanPaiche.aspx.cs" Inherits="CY.WebForm.Pages.business.DeliverPlanPaiche" %>
-
-<!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>
- <td style="border:none;width: 100px;">
- </td>
- <td style="border:none;">
- </td>
-
- </tr>
-
- <tr>
- <td align="right">
- 椹鹃┒鍛橈細
- </td>
- <td align="left">
-
- <select keepdefaultstyle='true' id='selDriverId' runat="server" datatextfield='Name' datavaluefield='Keyid' class="Sreq">
- </select>
-
- </td>
- <td align="right">
-
- </td>
- <td align="left">
-
- </td>
- </tr>
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DeliverPlanPaiche.aspx.cs" Inherits="CY.WebForm.Pages.business.DeliverPlanPaiche" %>
+
+<!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>
+ <td style="border:none;width: 100px;">
+ </td>
+ <td style="border:none;">
+ </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>
+ <td class="ali03 ">
+ 閫佽揣鏃堕棿锛�
+ </td>
+ <td align="left">
+ <input id="txtDeliverTime" type="text" runat="server" class='date req' maxlength='10' />
+ </td>
+ </tr>
<tr>
- <td class="contentLeft" colspan="4" style=" padding-left:300px;">
- <asp:Button ID="btnSaves" runat="server" Text="鎻愪氦" OnClick="btnSave_ServerClick" />
-
+ <td class="ali03 " style="width: 120px;">娉ㄦ剰浜嬮」锛�</td>
-
-
-
+ <td style=" text-align:left;" colspan="3">
+ <textarea id="txtZhuyishixiang" name="txtZhuyishixiang" runat="server" style="width: 402px; height: 30px;" class="req" maxlength="200"></textarea>
</td>
- </tr>
- </table>
-
-
-
- </form>
-
-</body>
-<script type="text/javascript" language="javascript">
-
-
-
-</script>
-</html>
+
+ </tr>
+ <tr>
+ <td class="contentLeft" colspan="4" 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/DeliverPlanPaiche.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaiche.aspx.cs
index a945dd9..38b7494 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaiche.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaiche.aspx.cs
@@ -24,6 +24,7 @@
using CY.WebForm.Pages.common;
using CY.BLL.EC;
using CY.Model.Inquiry;
+using System.Transactions;
namespace CY.WebForm.Pages.business
{
@@ -33,6 +34,7 @@
OA_DeliverPlanBLL _OA_DeliverPlanBLL = null;
OA_StaffBLL bll_OA_StaffBLL = null;
OA_CarManageBll _OA_CarManageBll = null;
+ OA_DeliverPlanPaicheBLL _OA_DeliverPlanPaicheBLL = null;
//鍒濆鍖�
@@ -42,6 +44,7 @@
_OA_DeliverPlanBLL = new OA_DeliverPlanBLL();
bll_OA_StaffBLL = new OA_StaffBLL();
_OA_CarManageBll = new OA_CarManageBll();
+ _OA_DeliverPlanPaicheBLL = new OA_DeliverPlanPaicheBLL();
}
@@ -96,16 +99,42 @@
- this.selDriverId.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, null, null).Where(x => x.BF_IsDriver == true);//.Where(x => x.SM_Post.Equals("椹鹃┒鍛�")) ;
- this.selDriverId.DataTextField = "Name";
- this.selDriverId.DataValueField = "Keyid";
- this.selDriverId.DataBind();
- this.selDriverId.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+ this.selCarId.DataSource = _OA_CarManageBll.SelectListByFirmId(CurrentUser.MemberId);
+ this.selCarId.DataTextField = "CarNumber";
+ this.selCarId.DataValueField = "Keyid";
+ this.selCarId.DataBind();
+ this.selCarId.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
- string keyid = Request["keyid"];
-
-
+ var ids = Request["ids"].ToString().Trim(',').Split(',');
+ //var dizhi = "";
+ for (int i = 0; i < ids.Length; i++)
+ {
+ var deliverPlan = _OA_DeliverPlanBLL.GetModelByKeyid(ids[i].ToGuid2(), null, null);
+ if(i == 0)
+ {
+ //dizhi = deliverPlan.Dizhi;
+ if (deliverPlan.DeliverTime.HasValue)
+ {
+ this.txtDeliverTime.Value = deliverPlan.DeliverTime.Value.ToString("yyyy-MM-dd");
+ }
+ }
+ //else
+ //{
+ // if(deliverPlan.Dizhi != dizhi)
+ // {
+ // //鎿嶄綔鎴愬姛
+ // JavaScript.MessageBox("涓嶅悓鍦板潃鐨勮鍗曚笉鑳界粺涓�娲捐溅", this, true, false);
+ // return;
+ // }
+ //}
+ if(deliverPlan.CarId.HasValue && deliverPlan.CarId.Value > 0)
+ {
+ //鎿嶄綔鎴愬姛
+ JavaScript.MessageBox("宸茬粡娲捐溅鐨勯�佽揣鍗曚笉鑳介噸澶嶆淳杞�", this, true, false);
+ return;
+ }
+ }
}
}
@@ -170,40 +199,80 @@
bool isWin = false;
- try
+ 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(',');
-
-
- foreach (var keyid in ids)
- {
- var deliverPlan = _OA_DeliverPlanBLL.GetModelByKeyid(keyid.ToGuid2(), null, null);
-
- deliverPlan.DriverId = this.selDriverId.Value.ToInt32();
-
- var carManage = _OA_CarManageBll.SelectListByFirmId(CurrentUser.MemberId).Where(x => x.StaffID == deliverPlan.DriverId).FirstOrDefault();
+ OA_DeliverPlan oA_DeliverPlanPaiche = null;
+ var Keyid = Guid.NewGuid();
+ int DriverId = 0;
+ var i = 0;
+ var carManage = _OA_CarManageBll.GetModelByKeyid(this.selCarId.Value.ToInt32());
if (carManage != null)
{
- deliverPlan.CarId = carManage.Keyid ?? 0;
+ DriverId = carManage.StaffID ?? 0;
}
else
{
- deliverPlan.CarId = 0;
+ DriverId = 0;
}
- isWin = _OA_DeliverPlanBLL.UpdateModel(deliverPlan);
+ var dingdanhao = "閫佽揣鍗曪細";
+
+ foreach (var keyid in ids)
+ {
+ var deliverPlan = _OA_DeliverPlanBLL.GetModelByKeyid(keyid.ToGuid2(), null, null);
+ if (i == 0)
+ {
+ oA_DeliverPlanPaiche = deliverPlan;
+ }
+ dingdanhao += deliverPlan.SellerOrderId + ",";
+ deliverPlan.CarId = this.selCarId.Value.ToInt32();
+ deliverPlan.DriverId = DriverId;
+ deliverPlan.DeliverPlanPaicheid = Keyid;
+ deliverPlan.Updater = CurrentUser.TrueMemberId;
+ deliverPlan.LastUpdateTime = DateTime.Now;
+ isWin = _OA_DeliverPlanBLL.UpdateModel(deliverPlan);
+ }
+ oA_DeliverPlanPaiche.Keyid = Keyid;
+ oA_DeliverPlanPaiche.DeliverTime = this.txtDeliverTime.Value.ToDateTime2();
+ oA_DeliverPlanPaiche.Remark = dingdanhao.Trim(',')+"銆�" + this.txtZhuyishixiang.Value;
+ oA_DeliverPlanPaiche.shuliang = ids.Length;
+ var oA_DeliverPlans = _OA_DeliverPlanPaicheBLL.GetModelByDeliveredTime(CurrentUser.MemberId, oA_DeliverPlanPaiche.DeliverTime.Value).Max(x=>x.Sort);
+ if (oA_DeliverPlans.HasValue)
+ {
+ oA_DeliverPlanPaiche.Sort = oA_DeliverPlans.Value + 1;
+ }
+ else
+ {
+ oA_DeliverPlanPaiche.Sort = 1;
+ }
+
+ isWin = _OA_DeliverPlanPaicheBLL.InsertModel(oA_DeliverPlanPaiche);
+ scope.Complete();
+ }
+ catch (Exception ex)
+ {
+
+ PAGEHandleException(ex);
+ JavaScript.MessageBox("鎿嶄綔澶辫触", this);
+ }
+ finally
+ {
+ // 閲婃斁璧勬簮
+ scope.Dispose();
}
-
-
}
- catch (Exception ex)
- {
- isWin = false;
- }
-
-
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaiche.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaiche.aspx.designer.cs
index 31bc593..d6ba7f2 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaiche.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaiche.aspx.designer.cs
@@ -42,13 +42,31 @@
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
- /// selDriverId 鎺т欢銆�
+ /// selCarId 鎺т欢銆�
/// </summary>
/// <remarks>
/// 鑷姩鐢熸垚鐨勫瓧娈点��
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
- protected global::System.Web.UI.HtmlControls.HtmlSelect selDriverId;
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selCarId;
+
+ /// <summary>
+ /// txtDeliverTime 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtDeliverTime;
+
+ /// <summary>
+ /// txtZhuyishixiang 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlTextArea txtZhuyishixiang;
/// <summary>
/// btnSaves 鎺т欢銆�
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheEdit.aspx
new file mode 100644
index 0000000..20157c0
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheEdit.aspx
@@ -0,0 +1,241 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DeliverPlanPaicheEdit.aspx.cs" Inherits="CY.WebForm.Pages.business.DeliverPlanPaicheEdit" %>
+
+<!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">
+ function ReBindClients() {
+ $.ajax({
+ url: "/Pages/business/OrderEdit.aspx",
+ type: "POST",
+ dataType: "html",
+ data: { Target: "ReBindClients"},
+ global: false,
+ cache: false,
+ async: false,
+ success: function (data) {
+ $("#selBuyerId").html(data);
+ }
+ });
+ }
+ function custormerChange(sel) {
+
+
+ CallServer({ Target: "GetCommunication", id: sel.value }, function (data, textStatus) {
+ var jobj = false;
+ try {
+ jobj = eval('[' + data + ']')[0];
+ } catch (ex) {
+ global.DealDataException(ex); return;
+ }
+ if (jobj) {
+ document.getElementById('txtLianxiren').value = jobj.BusinessManagers;
+ document.getElementById('txtDizhi').value = jobj.Province + jobj.City + jobj.County + jobj.DetailedAddress ;
+ document.getElementById('txtDianhua').value = jobj.CompanyPhone;
+ document.getElementById('txtCompanyName').value = jobj.CompanyName;
+ } else;
+ });
+ }
+
+
+
+
+ //涓篠elect鏂板杩囨护鍔熻兘
+ function SelectAddSearch() {
+ $("select[SelInputHtml='True']").each(function (i, v) {
+ $(this).unbind("blur");
+ var old = $(this).html();
+ var oldObject = $(this).clone();
+ var sign = "selectS" + i;
+ $(v).attr("sign", sign);
+
+ var inputClass = "input_" + sign;
+ var html = "<span style='margin-left:10px'>杩囨护锛�</span><input type='text' class='" + inputClass + "' style='width:80px;height:18px;line-height:18px;'/>";
+ $(v).after(html);
+ $("." + inputClass).blur(function () {
+ var nowval = $(this).val().trim();
+ var output = "";
+ if (nowval == "" || nowval == null) {
+ output = old;
+ } else {
+ output += "<option value=''>璇烽�夋嫨</option>";
+ var valueArr = new Array();
+ oldObject.find("option").each(function (ii, vv) {
+
+ var value = $.trim($(vv).attr("value"));
+ var text = $.trim($(vv).text());
+
+ if (text.indexOf(nowval) >= 0)
+ valueArr.push(value + "|||" + text);
+ });
+ for (var ss in valueArr) {
+ var s = valueArr[ss];
+ if (s.split("|||").length == 2) {
+ var value1 = s.split("|||")[0];
+ var text1 = s.split("|||")[1];
+ output += "<option value='" + value1 + "'>" + text1 + "</option>";
+ }
+ }
+ }
+ $(v).html(output);
+ });
+ });
+ }
+
+ window.FastKeyDistinctived = true; //渚嬪蹇嵎閿�(涓嶄娇鐢ㄩ�氱敤蹇嵎閿�)
+ var keyDownHook = new KeyBehaviorHook('keydown');
+ keyDownHook.Regist(window.Keys.S, "ClickElement('btnSave')", window.WithKey.Ctrl); //Ctrl+s 淇濆瓨
+ keyDownHook.Regist(window.Keys.Enter, "ClickElement('btnSave')", window.WithKey.Ctrl); //Ctrl+Enter 淇濆瓨
+ keyDownHook.Regist(window.Keys.R, "ClickElement('btnReset')", window.WithKey.Ctrl); //Ctrl+R 閲嶇疆
+ keyDownHook.Regist(window.Keys.Q, "ClickElement('btnBackList')", window.WithKey.Ctrl); //Ctrl+Q 閫�鍑�(Quit)
+
+ $(function () {
+ SelectAddSearch();
+ keyDownHook.Binding();
+ global.SetReqMsg();
+
+ });
+
+
+
+
+ </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>
+ <td style="border:none;width: 100px;">
+ </td>
+ <td style="border:none;">
+ </td>
+
+ </tr>
+
+ <tr>
+ <td align="right">
+ 鏀惰揣鍗曚綅锛�
+ </td>
+ <td align="left">
+
+ <span id='spnCustormerControl'><select id='selBuyerId' runat="server" keepdefaultstyle='true' datavaluefield='MemberId' datatextfield='CompanyName' onchange='custormerChange(this)' selinputhtml="True" sign="" style=" width:123px;"></select>
+ <%--<input type="button" value='鏂板' keepdefaultstyle='true' onclick="top.Dialog.open({ URL: '/Pages/business/CorporateClientsEdit.aspx', Title: '鏂板瀹㈡埛', Width: 900, Height: 680});" />--%>
+ </span>
+
+ </td>
+ <td align="right">
+ 鏀惰揣鍗曚綅锛�
+ </td>
+ <td align="left">
+ <input id='txtCompanyName' runat="server" maxlength="200" class='Sreq' style="width:200px;" />
+ </td>
+ </tr>
+ <tr>
+ <td align="right">
+ 鑱旂郴浜猴細
+ </td>
+ <td align="left">
+ <input id='txtLianxiren' runat="server" maxlength="200" />
+ </td>
+ <td align="right">
+ 鑱旂郴鐢佃瘽锛�
+ </td>
+ <td align="left">
+ <input id='txtDianhua' class='req' runat="server" maxlength="200" />
+ </td>
+
+
+ </tr>
+ <tr>
+ <td align="right">
+ 鏀惰揣鍦板潃锛�
+ </td>
+ <td align="left">
+ <input id='txtDizhi' class='req' runat="server" maxlength="200" style="width:300px;" />
+ </td>
+ <td align="right">
+ 閫佽揣鏃堕棿锛�
+ </td>
+ <td align="left">
+ <input id='txtDeliverTime' class='date req' runat="server" />
+ </td>
+
+
+ </tr>
+ <tr>
+ <td align="right">
+ 杞﹁締锛�
+ </td>
+ <td align="left">
+ <select keepdefaultstyle='true' id='selCarId' runat="server" datatextfield='Name' datavaluefield='Keyid' class="Sreq">
+ </select>
+ </td>
+ <td align="right">
+ 鎺掑簭锛�
+ </td>
+ <td align="left">
+ <input id="txtSort" type="text" runat="server" maxlength="10" class="req int w90px" />
+ </td>
+ </tr>
+ </table>
+
+
+ <table class="table2">
+ <tbody>
+
+
+ <tr>
+ <td style="width: 100px; text-align:right;">
+ 閫佽揣澶囨敞锛�
+ </td>
+ <td style=" text-align:left;">
+ <textarea id="txtRemark" name="txtRemark" runat="server" style="width: 692px; height: 30px;" maxlength="200" ></textarea>
+ </td>
+ </tr>
+ <tr>
+ <td class="contentLeft" colspan="2" style=" padding-left:300px;">
+ <asp:Button ID="btnSaves" runat="server" Text="淇濆瓨閫佽揣鍗�" OnClick="btnSave_ServerClick" />
+
+
+
+
+
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </form>
+
+</body>
+<script type="text/javascript" language="javascript">
+
+
+
+</script>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheEdit.aspx.cs
new file mode 100644
index 0000000..9f75ae2
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheEdit.aspx.cs
@@ -0,0 +1,353 @@
+锘�/**
+* 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;
+
+namespace CY.WebForm.Pages.business
+{
+ public partial class DeliverPlanPaicheEdit : BasePage
+ {
+ public int Orderid = 0;
+ public int printNum = 0;
+
+ OA_CarManageBll _OA_CarManageBll = null;
+ OA_DeliverPlanPaicheBLL oA_DeliverPlanBLL = null;
+
+ //鍒濆鍖�
+ public DeliverPlanPaicheEdit()
+ {
+
+
+ _OA_CarManageBll = new OA_CarManageBll();
+ oA_DeliverPlanBLL = new OA_DeliverPlanPaicheBLL();
+
+
+ }
+
+ /// <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)
+ {
+
+ Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//瀛楀吀涓氬姟閫昏緫鎿嶄綔绫诲璞�
+ SysInquiry_PrintingTypeBLL _sysInquiry_PrintingTypeBLL = new SysInquiry_PrintingTypeBLL();//鍗板埛涓氬姟绫诲瀷涓氬姟閫昏緫鎿嶄綔绫诲璞�
+ OA_CorporateClientsBLL _oA_CorporateClientsBLL = new OA_CorporateClientsBLL();
+ EC_OrderBasicBLL _eC_OrderBasicBLL = new EC_OrderBasicBLL();
+
+
+
+ IList<OA_CorporateClients> corporateClients = _oA_CorporateClientsBLL.SelectListByFirmId(CurrentUser.MemberId) as IList<OA_CorporateClients>;
+ if (null != corporateClients)
+ {
+ corporateClients.Where(cc => CurrentUser.MemberId.Equals(cc.MemberId) && corporateClients.Remove(cc));
+ }
+ this.selBuyerId.DataSource = corporateClients;
+ this.selBuyerId.DataBind();
+ this.selBuyerId.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+
+
+ this.selCarId.DataSource = _OA_CarManageBll.SelectListByFirmId(CurrentUser.MemberId);
+ this.selCarId.DataTextField = "CarNumber";
+ this.selCarId.DataValueField = "Keyid";
+ this.selCarId.DataBind();
+ this.selCarId.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+
+ this.txtSort.Value = "1";
+
+ this.txtDeliverTime.Value = DateTime.Now.AddDays(1).ToString("yyyy-MM-dd");
+
+ var keyid = Request["keyid"];
+ if (!string.IsNullOrEmpty(keyid))
+ {
+ var sss = oA_DeliverPlanBLL.GetModelByKeyid(keyid.ToGuid2(), null, null);
+ if (sss != null)
+ {
+ if (sss.DeliveredTime.HasValue)
+ {
+ JavaScript.MessageBox("宸茬粡閫佽揪涓嶈兘淇敼", this, true, false);
+ }
+ this.selBuyerId.Value = sss.BuyerId.ToString();
+ this.txtCompanyName.Value = sss.CompanyName;
+
+ this.txtLianxiren.Value = sss.Lianxiren;
+ this.txtDianhua.Value = sss.Dianhua;
+ this.txtDizhi.Value = sss.Dizhi;
+ this.txtDeliverTime.Value = sss.DeliverTime.HasValue ? sss.DeliverTime.Value.ToString("yyyy-MM-dd") : "";
+ this.selCarId.Value = sss.CarId.HasValue ? sss.CarId.Value.ToString() : "0";
+ this.txtSort.Value = sss.Sort.HasValue ? sss.Sort.Value.ToString() : "1";
+ this.txtRemark.Value = sss.Remark;
+ }
+ }
+
+
+ }
+ }
+
+ /// <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()
+ {
+ 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;
+ try
+ {
+ var keyid = Request["keyid"];
+ EC_OrderBasicBLL _eC_OrderBasicBLL = new EC_OrderBasicBLL();
+
+ OA_CorporateClientsBLL _oA_CorporateClientsBLL = new OA_CorporateClientsBLL();
+
+ string SellerOrderId = "";
+
+
+
+
+
+ OA_DeliverPlan oA_DeliverPlan = new OA_DeliverPlan();
+ oA_DeliverPlan.Lianxiren = this.txtLianxiren.Value;
+ oA_DeliverPlan.Keyid = Guid.NewGuid();
+ oA_DeliverPlan.FirmId = CurrentUser.MemberId;
+ oA_DeliverPlan.DeliverTime = DateTime.Parse(this.txtDeliverTime.Value);
+ if (string.IsNullOrWhiteSpace(this.selBuyerId.Value))
+ {
+ oA_DeliverPlan.BuyerId = Guid.Empty;
+ oA_DeliverPlan.BusinessManagerId = 0;
+ oA_DeliverPlan.Biddingcompany = 0;
+
+ }
+ else
+ {
+ oA_DeliverPlan.BuyerId = this.selBuyerId.Value.ToGuid2();
+ OA_CorporateClients oA_CorporateClients = _oA_CorporateClientsBLL.SelectModelByFirmIdandMemberId(CurrentUser.MemberId, this.selBuyerId.Value.ToGuid2());
+ oA_DeliverPlan.BusinessManagerId = oA_CorporateClients.BusinessManagerId ?? 0;
+ oA_DeliverPlan.Biddingcompany = oA_CorporateClients.Biddingcompany ?? 0;
+
+ }
+
+ oA_DeliverPlan.DeliveredTime = null;
+ oA_DeliverPlan.Zhuyishixiang = "";
+ oA_DeliverPlan.Gongzuokaoping = "";
+ oA_DeliverPlan.CarId = this.selCarId.Value.ToInt32();
+ var carManage = _OA_CarManageBll.GetModelByKeyid(this.selCarId.Value.ToInt32());
+ if (carManage != null)
+ {
+ oA_DeliverPlan.DriverId = carManage.StaffID ?? 0;
+ }
+ else
+ {
+ oA_DeliverPlan.DriverId = 0;
+ }
+
+ oA_DeliverPlan.Transferstatus = 1;
+ oA_DeliverPlan.TransfersTime = null;
+ oA_DeliverPlan.Sort = this.txtSort.Value.ToInt32();
+ oA_DeliverPlan.Creater = CurrentUser.TrueMemberId;
+ oA_DeliverPlan.CreateTime = DateTime.Now;
+ oA_DeliverPlan.Updater = CurrentUser.TrueMemberId;
+ oA_DeliverPlan.LastUpdateTime = DateTime.Now;
+ oA_DeliverPlan.wentifankui = "";
+ oA_DeliverPlan.SellerOrderId = SellerOrderId;
+ oA_DeliverPlan.Dianhua = this.txtDianhua.Value;
+ oA_DeliverPlan.Dizhi = this.txtDizhi.Value;
+ oA_DeliverPlan.Remark = this.txtRemark.Value;
+
+ oA_DeliverPlan.shifouDelivery = 1;
+ oA_DeliverPlan.CompanyName = this.txtCompanyName.Value;
+ if (!string.IsNullOrEmpty(keyid))
+ {
+ var sss = oA_DeliverPlanBLL.GetModelByKeyid(keyid.ToGuid2(), null, null);
+ if (sss != null)
+ {
+ sss.Lianxiren = oA_DeliverPlan.Lianxiren;
+ sss.DeliverTime = oA_DeliverPlan.DeliverTime;
+ sss.BuyerId = oA_DeliverPlan.BuyerId;
+ if(sss.BuyerId == Guid.Empty)
+ {
+ sss.BusinessManagerId = 0;
+ }
+ else
+ {
+ sss.BusinessManagerId = oA_DeliverPlan.BusinessManagerId;
+ }
+ sss.Biddingcompany = oA_DeliverPlan.Biddingcompany;
+ sss.CarId = oA_DeliverPlan.CarId;
+ sss.DriverId = oA_DeliverPlan.DriverId;
+ sss.Sort = oA_DeliverPlan.Sort;
+ sss.Dianhua = oA_DeliverPlan.Dianhua;
+ sss.Dizhi = oA_DeliverPlan.Dizhi;
+ sss.Remark = oA_DeliverPlan.Remark;
+ sss.CompanyName = oA_DeliverPlan.CompanyName;
+
+ isWin = oA_DeliverPlanBLL.UpdateModel(sss);
+ }
+ }
+ else
+ {
+ isWin = oA_DeliverPlanBLL.InsertModel(oA_DeliverPlan);
+ }
+
+
+ }
+ catch (Exception ex)
+ {
+ isWin = false;
+ }
+
+
+
+
+
+ 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/DeliverPlanPaicheEdit.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheEdit.aspx.designer.cs
new file mode 100644
index 0000000..fb6109f
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheEdit.aspx.designer.cs
@@ -0,0 +1,134 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.business
+{
+
+
+ public partial class DeliverPlanPaicheEdit
+ {
+
+ /// <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>
+ /// selBuyerId 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selBuyerId;
+
+ /// <summary>
+ /// txtCompanyName 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtCompanyName;
+
+ /// <summary>
+ /// txtLianxiren 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtLianxiren;
+
+ /// <summary>
+ /// txtDianhua 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtDianhua;
+
+ /// <summary>
+ /// txtDizhi 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtDizhi;
+
+ /// <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>
+ /// txtSort 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtSort;
+
+ /// <summary>
+ /// txtRemark 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlTextArea txtRemark;
+
+ /// <summary>
+ /// btnSaves 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button btnSaves;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheList.aspx
new file mode 100644
index 0000000..6ed30f2
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheList.aspx
@@ -0,0 +1,672 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DeliverPlanPaicheList.aspx.cs" Inherits="CY.WebForm.Pages.business.DeliverPlanPaicheList" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head id="Head1" runat="server">
+ <title>璁㈠崟鍒楄〃</title>
+ <uc:cmshead id="CMSHead1" runat="server" />
+ <%-- <script src="../../js/business/Order.js" type="text/javascript"></script>--%>
+ <script type="text/javascript">
+ //宸ヤ綔鑰冭瘎
+ function View(Keyid, BuyerId, DeliverTime,Sort) {
+ //if (Keyid == '00000000-0000-0000-0000-000000000000') {
+ // alert("璇峰厛瀹夋帓閫佽揣锛�");
+ // return;
+ //}
+
+ top.Dialog.open({ URL: "/Pages/business/DeliverPlanSort.aspx?Keyid=" + Keyid + "&BuyerId=" + BuyerId + "&DeliverTime=" + DeliverTime + "&Sort=" + Sort, Title: "閫佽揣瀹夋帓鎺掑簭", Width: 300, Height: 300 });
+ }
+
+ //宸ヤ綔鑰冭瘎
+ function ViewZhuyishixiang(Keyid, BuyerId, DeliverTime) {
+ //if (Keyid == '00000000-0000-0000-0000-000000000000') {
+ // alert("璇峰厛瀹夋帓閫佽揣锛�");
+ // return;
+ //}
+
+ top.Dialog.open({ URL: "/Pages/business/DeliverPlanPaicheZhuyishixiang.aspx?Keyid=" + Keyid + "&BuyerId=" + BuyerId + "&DeliverTime=" + DeliverTime , Title: "閫佽揣瀹夋帓娉ㄦ剰浜嬮」", Width: 800, Height: 300 });
+ }
+
+ //宸ヤ綔鑰冭瘎
+ function ViewGongzuokaoping(Keyid, BuyerId, DeliverTime) {
+ //if (Keyid == '00000000-0000-0000-0000-000000000000') {
+ // alert("璇峰厛瀹夋帓閫佽揣锛�");
+ // return;
+ //}
+
+ top.Dialog.open({ URL: "/Pages/business/DeliverPlanGongzuokaoping.aspx?Keyid=" + Keyid + "&BuyerId=" + BuyerId + "&DeliverTime=" + DeliverTime , Title: "閫佽揣瀹夋帓宸ヤ綔鑰冭瘎", Width: 800, Height: 300 });
+ }
+
+
+ //閫佽揣瀹夋帓
+ function ToAddorder() {
+ top.Dialog.open({ URL: "/Pages/business/DeliverPlanPaicheEdit.aspx", Title: "鏂板閫佽揣鍗�", Width: 900, Height: 750 });
+ }
+ //閫佽揣瀹夋帓
+ function Xiugai(keyid) {
+ top.Dialog.open({ URL: "/Pages/business/DeliverPlanPaicheEdit.aspx?keyid=" + keyid, Title: "淇敼閫佽揣鍗�", Width: 900, Height: 750 });
+ }
+
+
+ //閫佽揣瀹夋帓
+ function outAfterWorks(Keyid, BuyerId, DeliveredTime) {
+ top.Dialog.open({ URL: "/Pages/business/OrderProductionprogress.aspx?SellerOrderId=" + SellerOrderId + "&Keyid=" + Keyid + "&works=" + works, Title: works, Width: 300, Height: 300 });
+ }
+ //鎵撳嵃
+ function outAfterWorks(Keyid) {
+ if (Keyid == '00000000-0000-0000-0000-000000000000') {
+ alert("璇峰厛瀹夋帓閫佽揣锛�");
+ return;
+ }
+ top.Dialog.open({ URL: "/Pages/business/DeliverPlanPrint.aspx?Keyid=" + Keyid + "&DelayTime=2021-04-09", Title: "宸ヤ綔鑰冭瘎", Width: 1000, Height: 800 });
+ }
+
+ ///鎵归噺鍙楃悊
+ function ToAllAccept1() {
+
+ var ids = '';
+ var cks = $("input[name='ckId']:checked");
+ if (cks.length == 0) { alertMsg('娌℃湁閫変腑浠讳綍椤癸紒'); return; } else { }
+ var isCan = true;
+ var DeliverTime = '';
+ var BuyerId = '';
+
+
+
+ cks.each(
+ function () {
+ var ckVal = $(this).val();
+
+ var ckValJson = eval('(' + ckVal + ')');
+
+ ids = ids + ',' + ckValJson.id;
+ //orderShowIds = orderShowIds + ',' + ckValJson.ordershowId;
+
+ DeliverTime = DeliverTime + ',' + ckValJson.DeliverTime;
+ BuyerId = BuyerId + ',' + ckValJson.BuyerId;
+ }
+ );
+
+
+ if (!isCan) {
+ // alertMsg('璇烽�夋嫨鏈彈鐞嗙殑璁㈠崟锛�');
+ }
+ else {
+ if (ids != '') {
+ ids = ids.substring(1);
+ DeliverTime = DeliverTime.substring(1);
+ BuyerId = BuyerId.substring(1);
+ }
+
+ var msg = ('纭绉讳氦鍗曟嵁鍚�?') ;
+ top.Dialog.confirm(msg, function () {
+ DoAcceptAll(ids, DeliverTime, BuyerId);
+ });
+ }
+ }
+
+ /*
+鎵归噺澶勭悊鍙楃悊璁㈠崟
+*/
+ var DoAcceptAll = function (orderIds, DeliverTime, BuyerId) {
+ CallServer({ Target: "AcceptOrderAll", ids: orderIds, DeliverTimes: DeliverTime, BuyerIds: BuyerId }, function (data, textStatus) {
+ if ('1' == data) {
+ alertMsg('鎿嶄綔鎴愬姛锛�');
+ RefreshDIVOpener(); //鍏抽棴椤甸潰
+ } else {
+ alertMsg('-1' == data ? '绉讳氦鍗曟嵁澶辫触锛�' : '绉讳氦鍗曟嵁澶辫触锛�');
+ //dialog.close();
+ }
+ });
+ }
+
+
+ ///鎵归噺鍙楃悊
+ function ToAllAccept3() {
+
+ var ids = '';
+ var cks = $("input[name='ckId']:checked");
+ if (cks.length == 0) { alertMsg('娌℃湁閫変腑浠讳綍椤癸紒'); return; } else { }
+ var isCan = true;
+ var DeliverTime = '';
+ var BuyerId = '';
+
+ //var carid = $("#selCarIddo").val();
+ //var driverid = $("#selDriverIddo").val();
+
+ //if (carid == "") { alertMsg('璇烽�夋嫨杞﹁締锛�'); return; } else { }
+ //if (driverid == "") { alertMsg('璇烽�夋嫨椹鹃┒鍛橈紒'); return; } else { }
+
+ cks.each(
+ function () {
+ var ckVal = $(this).val();
+
+ var ckValJson = eval('(' + ckVal + ')');
+
+ ids = ids + ',' + ckValJson.id;
+ //orderShowIds = orderShowIds + ',' + ckValJson.ordershowId;
+
+ DeliverTime = DeliverTime + ',' + ckValJson.DeliverTime;
+ BuyerId = BuyerId + ',' + ckValJson.BuyerId;
+ }
+ );
+
+
+ if (!isCan) {
+ // alertMsg('璇烽�夋嫨鏈彈鐞嗙殑璁㈠崟锛�');
+ }
+ else {
+ if (ids != '') {
+ ids = ids.substring(1);
+ //DeliverTime = DeliverTime.substring(1);
+ //BuyerId = BuyerId.substring(1);
+ }
+
+ top.Dialog.open({ URL: "/Pages/business/DeliverPlanPaiche.aspx?ids=" + ids, Title: "瀹夋帓杞﹁締", Width: 600, Height: 300 });
+ }
+ }
+
+
+
+ //宸ヤ綔鑰冭瘎
+ function danjuyijiao(Keyid, Transferstatus) {
+
+
+ top.Dialog.open({ URL: "/Pages/business/DeliverPlanYijiao.aspx?ids=" + Keyid, Title: "鍗曟嵁绉讳氦", Width: 600, Height: 300 });
+ }
+
+ //宸ヤ綔鑰冭瘎
+ function chehui(Keyid, Transferstatus) {
+
+ var msg = ('纭鎾ゅ洖鍚�?');
+ top.Dialog.confirm(msg, function () {
+ top.Dialog.open({ URL: "/Pages/business/DeliverPlanChehui.aspx?ids=" + Keyid, Title: "鍗曟嵁鎾ゅ洖", Width: 600, Height: 300 });
+ });
+
+
+
+ }
+
+
+
+ ///鎵归噺鍙楃悊
+ function ToAllAccept4() {
+
+ var ids = '';
+ var cks = $("input[name='ckId']:checked");
+ if (cks.length == 0) { alertMsg('娌℃湁閫変腑浠讳綍椤癸紒'); return; } else { }
+ var isCan = true;
+ var DeliverTime = '';
+ var BuyerId = '';
+
+ //var carid = $("#selCarIddo").val();
+ //var driverid = $("#selDriverIddo").val();
+
+ //if (carid == "") { alertMsg('璇烽�夋嫨杞﹁締锛�'); return; } else { }
+ //if (driverid == "") { alertMsg('璇烽�夋嫨椹鹃┒鍛橈紒'); return; } else { }
+
+ cks.each(
+ function () {
+ var ckVal = $(this).val();
+
+ var ckValJson = eval('(' + ckVal + ')');
+
+ ids = ids + ',' + ckValJson.id;
+ //orderShowIds = orderShowIds + ',' + ckValJson.ordershowId;
+
+ DeliverTime = DeliverTime + ',' + ckValJson.DeliverTime;
+ BuyerId = BuyerId + ',' + ckValJson.BuyerId;
+ }
+ );
+
+
+ if (!isCan) {
+ // alertMsg('璇烽�夋嫨鏈彈鐞嗙殑璁㈠崟锛�');
+ }
+ else {
+ if (ids != '') {
+ ids = ids.substring(1);
+ //DeliverTime = DeliverTime.substring(1);
+ //BuyerId = BuyerId.substring(1);
+ }
+
+ top.Dialog.open({ URL: "/Pages/business/DeliverPlanYijiao.aspx?ids=" + ids, Title: "鍗曟嵁绉讳氦", Width: 600, Height: 300 });
+ }
+ }
+
+
+
+
+ ///鎵归噺鍙楃悊
+ function ToAllAccept2() {
+
+ var ids = '';
+ var cks = $("input[name='ckId']:checked");
+ if (cks.length == 0) { alertMsg('娌℃湁閫変腑浠讳綍椤癸紒'); return; } else { }
+ var isCan = true;
+ var DeliverTime = '';
+ var BuyerId = '';
+
+ var carid = $("#selCarIddo").val();
+ var driverid = $("#selDriverIddo").val();
+
+ if (carid == "") { alertMsg('璇烽�夋嫨杞﹁締锛�'); return; } else { }
+ if (driverid == "") { alertMsg('璇烽�夋嫨椹鹃┒鍛橈紒'); return; } else { }
+
+ cks.each(
+ function () {
+ var ckVal = $(this).val();
+
+ var ckValJson = eval('(' + ckVal + ')');
+
+ ids = ids + ',' + ckValJson.id;
+ //orderShowIds = orderShowIds + ',' + ckValJson.ordershowId;
+
+ DeliverTime = DeliverTime + ',' + ckValJson.DeliverTime;
+ BuyerId = BuyerId + ',' + ckValJson.BuyerId;
+ }
+ );
+
+
+ if (!isCan) {
+ // alertMsg('璇烽�夋嫨鏈彈鐞嗙殑璁㈠崟锛�');
+ }
+ else {
+ if (ids != '') {
+ ids = ids.substring(1);
+ DeliverTime = DeliverTime.substring(1);
+ BuyerId = BuyerId.substring(1);
+ }
+
+ var msg = ('纭娲捐溅鍚�?');
+ top.Dialog.confirm(msg, function () {
+ DoAcceptAll2(ids, DeliverTime, BuyerId, carid, driverid);
+ });
+ }
+ }
+
+ /*
+鎵归噺澶勭悊鍙楃悊璁㈠崟
+*/
+ var DoAcceptAll2 = function (orderIds, DeliverTime, BuyerId, carid, driverid) {
+ CallServer({ Target: "AcceptOrderAll2", ids: orderIds, DeliverTimes: DeliverTime, BuyerIds: BuyerId, Carid: carid, Driverid: driverid}, function (data, textStatus) {
+ if ('1' == data) {
+ alertMsg('鎿嶄綔鎴愬姛锛�');
+ RefreshDIVOpener(); //鍏抽棴椤甸潰
+ } else {
+ alertMsg('-1' == data ? '娲捐溅澶辫触锛�' : '娲捐溅澶辫触锛�');
+ //dialog.close();
+ }
+ });
+ }
+
+
+ /*
+鎵撳嵃閫佽揣鍗�
+*/
+ function ToPrintDriverorder(DriverId) {
+
+ OpenWindowByUrl('/Pages/business/DeliverOrderPrint.aspx?deliverorderId=' + DriverId, '', '');
+ }
+
+
+
+
+ //缁存姢
+ function onViewuplod(keyid) {
+ var l = (screen.availWidth - 500) / 2;
+ var t = (screen.availHeight - 300) / 2;
+ // window.open({ URL: "/Pages/business/CorporateClientsUpLoadContract.aspx?Keyid=" + keyid, Title: "鏌ョ湅鍚堝悓", Width: 900, Height: 750 });
+ window.open('/Pages/business/DeliverPlanFujianShow.aspx?Keyid=' + keyid + '&AttachmentType=3', '_blank', 'height=750,width=900,top=' + t + ',left=' + l + ',toolbar=no,menubar=no,scrollbars=no,resizable=no,location=no,status=no');
+ }
+
+ /*
+鎵撳嵃閫佽揣鍗�
+*/
+ function ToPrintdelev() {
+ var DeliveryTime = $("#txtDeliveryTime").val();
+ var CarId = $("#selCarId").val();
+ var DriverId = $("#selDriverId").val();
+ var CustormerName = $("#txtCustormerName").val();
+ var BusinessManager = $("#selBusinessManager").val();
+
+ // OpenWindowByUrl();
+ OpenWindowByUrl('/Pages/business/DeliverPlanPrint.aspx?DeliverTime=' + DeliveryTime + '&CarId=' + CarId + '&DriverId=' + DriverId + '&CustormerName=' + CustormerName + '&BusinessManager=' + BusinessManager, '', '');
+ }
+ </script>
+ <style type="text/css">
+ .tableStyleXS th { padding: 1px 0 1px 3px; background-image:none; border-bottom:1px solid #CCC; }
+ .tableStyleXS td { padding: 1px 0 1px 3px; }
+ .TableNewStyle select { width: 80px; }
+ .td_hide span { text-decoration: default; display: none; text-align: center; }
+ span.hand_no { cursor: default; display: block; font-size: 12px; }
+ span.hand_no:hover { text-decoration: none; }
+ span.hand_yes { cursor: pointer; display: block; font-size: 12px; }
+ .td_hide { cursor: pointer; }
+ </style>
+</head>
+<body>
+ <form id="form1" runat="server">
+ <div id="scrollContent" style="width: auto;">
+ <div class="box1">
+ <table class="TableNewStyle" style="width: 100%;">
+ <tr>
+
+
+
+
+ <td style="width:5%" >
+
+ </td>
+ <td style="width:5%">
+
+ </td>
+ <td style="width:5%" >
+
+ </td>
+ <td style="width:5%">
+
+ </td>
+ <td style="width:5%" >
+
+ </td>
+ <td style="width:15%">
+
+ </td> <td style="width:5%" >
+
+ </td>
+ <td style="width:10%">
+
+ </td> <td style="width:5%" >
+
+ </td>
+ <td style="width:10%">
+
+ </td>
+ <td style="width:5%" >
+
+ </td>
+ <td style="width:10%">
+
+ </td>
+
+
+ </tr>
+ <tr>
+ <td class="ali03">
+ 閫佽揣鏃堕棿锛�
+ </td>
+ <td colspan="5">
+ <%-- <asp:button id="Button0" text="閫炬湡" runat="server" padding="0px" OnClick="btn_Search_Click0" /> --%>
+ <asp:button id="Button1" text="鏃ユ湡" runat="server" padding="0px" OnClick="btn_Search_Click1" />
+ <asp:button id="Button2" text="鏃ユ湡" runat="server" padding="0px" OnClick="btn_Search_Click2" />
+ <asp:button id="Button3" text="鏃ユ湡" runat="server" padding="0px" OnClick="btn_Search_Click3" />
+ <asp:button id="Button4" text="鏃ユ湡" runat="server" padding="0px" OnClick="btn_Search_Click4" />
+ <asp:button id="Button5" text="鏃ユ湡" runat="server" padding="0px" OnClick="btn_Search_Click5" />
+ <asp:button id="Button6" text="鏃ユ湡" runat="server" padding="0px" OnClick="btn_Search_Click6" />
+ <asp:button id="Button7" text="鏃ユ湡" runat="server" padding="0px" OnClick="btn_Search_Click7" />
+ <input type="hidden" runat="server" id="txtDeliveryTime" />
+ </td>
+ <td class="ali03">
+ 閫佽揣鎯呭喌锛�
+ </td>
+ <td >
+ <select keepdefaultstyle='true' id='selSonghuo' runat="server" datatextfield='CarNumber' datavaluefield='Keyid'>
+ <option value="">鍏ㄩ儴</option>
+ <option value="1">瀹屾垚</option>
+ <option value="2">鏈畬鎴�</option>
+ </select>
+ </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>
+ <input id='txtCustormerName' runat="server" maxlength='50' />
+ </td>
+
+ </tr>
+
+ <tr>
+
+ <%-- <td class="ali03">
+ 鏂板閫佽揣杞﹁締锛�
+ </td>
+ <td >
+ <select keepdefaultstyle='true' id='selCarIddo' runat="server" datatextfield='CarNumber' datavaluefield='Keyid'>
+ </select>
+ </td>
+ <td class="ali03" >
+ 鏂板閫佽揣椹鹃┒鍛橈細
+ </td>
+ <td >
+ <select keepdefaultstyle='true' id='selDriverIddo' runat="server" datatextfield='Name' datavaluefield='Keyid'>
+ </select>
+ </td>--%>
+ <td class="ali03">
+ 涓氬姟缁忕悊锛�
+ </td>
+ <td>
+ <select keepdefaultstyle='true' id='selBusinessManager' runat="server" datatextfield='Name' datavaluefield='Keyid'>
+ </select>
+ </td>
+ <td class="ali03" >
+ 杞﹁締锛�
+ </td>
+ <td >
+ <select keepdefaultstyle='true' id='selCarId' runat="server" datatextfield='Name' datavaluefield='Keyid'>
+ </select>
+ </td>
+ <td colspan="8">
+
+ <asp:button id="btn_Search" text="鏌ヨ" runat="server" padding="0px" OnClick="btn_Search_Click" /> <input type="button" value='閲嶇疆' onclick='document.body.innerHTML="";window.location=window.location;' />
+
+ <input type="button" value='鏂板閫佽揣' onclick='ToAddorder();' />
+ <%-- <input type="button" value='娲捐溅' onclick='ToAllAccept3();' />
+ <input type="button" value='鍗曟嵁绉讳氦' onclick='ToAllAccept4();' />
+ <input type="button" value='鎵撳嵃鍏ㄩ儴' onclick='ToPrintdelev();' />--%>
+
+ </td>
+ </tr>
+
+
+ </table>
+ </div>
+
+ <%-- <div class="center" style=" margin-left:0px;">
+ <div class="left">
+ <div class="right">
+ <div class="padding_top5 padding_left10">
+ 杞﹁締锛� <select keepdefaultstyle='true' id='CarId' runat="server" datatextfield='CarNumber' datavaluefield='Keyid'>
</select>
<div class="box_tool_line">
+ </div>
椹鹃┒鍛橈細 <select keepdefaultstyle='true' id='DriverId' runat="server" datatextfield='Name' datavaluefield='Keyid'>
</select>
+ <div class="box_tool_line">
+ </div>
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+ <div class="box_tool_min">
+ <div class="center" style=" margin-left:0px;">
+ <div class="left">
+ <div class="right">
+ <div class="padding_top5 padding_left10">
+
+ <a href="javascript:;" onclick="ToAllAccept2();"><span class="icon_edit">鏂板閫佽揣</span></a>
+ <div class="box_tool_line">
+ </div>
+ <a href="javascript:;" onclick="ToAllAccept1();"><span class="icon_edit">鍗曟嵁绉讳氦</span></a>
+ <div class="box_tool_line">
+ </div>
+ <a href="javascript:;" onclick="ToPrintdelev()"><span class="icon_edit">鎵撳嵃</span></a>
+ <div class="clear">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="clear">
+ </div>
+ </div>--%>
+ <div clear="fl">
+ <table class="tableStyle tableStyleXS" useclick="false" usecheckbox="true" sortmode="false">
+ <thead>
+ <tr>
+ <th width="25">
+ </th>
+ <th width="25">
+ 椤哄簭
+ </th>
+ <%--<th style="text-align: center;" width="70">
+ 閫佽揣鍗曞彿
+ </th>--%>
+ <th style="text-align: center;" width="70">
+ 瑕佹眰鍒拌揪鏃堕棿
+ </th>
+ <th style="text-align: center;"width="100">
+ 瀹為檯鍒拌揪鏃堕棿
+ </th>
+ <th width="70">
+ 涓氬姟缁忕悊
+ </th>
+ <th width="100">
+ 瀹㈡埛鍗曚綅
+ </th>
+ <th style="text-align: center;"width="200">
+ 瀹㈡埛鍦板潃銆佽仈绯讳汉鍙婅仈绯荤數璇�
+ </th>
+
+
+ <th width="60">
+ 閫佽揣鍗曞崟鏁�
+ </th>
+ <th width="60">
+ 杞﹁締
+ </th>
+ <%-- <th width="60">
+ 椹鹃┒鍛�
+ </th>--%>
+ <%-- <th width="200">
+ 闂鍙嶉 </th>
+ --%>
+
+
+ <th width="200">
+ 娉ㄦ剰浜嬮」
+ </th>
+ <th width="200">
+ 宸ヤ綔鑰冭瘎
+ </th>
+
+
+ <th width="60">
+ 閫佽揣鍗�
+ </th>
+ <th width="60">
+ 绉讳氦
+ </th>
+
+ <th width="60">
+ 鎿嶄綔
+ </th>
+ </tr>
+ </thead>
+ <tbody>
+ <asp:repeater id="RepClientList" runat="server">
+ <itemtemplate>
+ <tr>
+ <td>
+ <input type="checkbox" name='ckId' value_keyid="<%#Eval("Keyid")%>" value="{
+ id:'<%#Eval("Keyid")%>',
+ DeliverTime: '<%#Eval("DeliverTime", "{0:yyyy-MM-dd}")%>',
+ BuyerId:'<%#Eval("BuyerId")%>',
+ CarId:'<%#Eval("CarId")%>',
+ DriverId:'<%#Eval("DriverId")%>',
+ }" id='ckBox<%#Container.ItemIndex%>' id='ckBox<%#Container.ItemIndex%>' class='ckBox' />
+ </td>
+
+ <td>
+ <a href='javascript:void(0)' title='鐐瑰嚮淇敼鎺掑簭' class='a_under' onclick='View("<%#Eval("Keyid")%>","<%#Eval("BuyerId")%>","<%#Eval("DeliverTime", "{0:yyyy-MM-dd}")%>","<%#Eval("Sort")%>")'> <%#Eval("Sort")==null?"淇敼鎺掑簭":Eval("Sort")%> </a>
+ </td>
+ <%-- <td>
+ <%#Eval("SellerOrderId")%>
+ </td>--%>
+ <td>
+ <%#Eval("DeliverTime", "{0:yyyy-MM-dd}")%>
+ </td>
+ <td>
+ <%#Eval("DeliveredTime", "{0:yyyy-MM-dd HH:mm}")%>
+ </td>
+ <td>
+ <%#Eval("BusinessManager")%>
+ </td>
+ <td>
+ <%#Eval("CompanyName")%>
+ </td>
+
+ <td>
+ <%#Eval("DizhiLianxirenDianhua")%>
+ </td>
+ <td>
+ <%#Eval("shuliang")%>
+ </td>
+ <td>
+ <%#Eval("CarName")%>
+ </td>
+ <%--<td>
+ <%#Eval("DriverName")%>
+ </td>--%>
+ <%-- <td>
+ <%#Eval("wentifankui")%>
+ </td>--%>
+ <td>
+ <a href='javascript:void(0)' title='鐐瑰嚮淇敼娉ㄦ剰浜嬮」' class='a_under' onclick='ViewZhuyishixiang("<%#Eval("Keyid")%>","<%#Eval("BuyerId")%>","<%#Eval("DeliverTime", "{0:yyyy-MM-dd}")%>")'> <%#Eval("Remark").ToString()==""?"淇敼娉ㄦ剰浜嬮」":Eval("Remark")%> </a>
+ </td>
+ <td>
+ <a href='javascript:void(0)' title='鐐瑰嚮淇敼宸ヤ綔鑰冭瘎' class='a_under' onclick='ViewGongzuokaoping("<%#Eval("Keyid")%>","<%#Eval("BuyerId")%>","<%#Eval("DeliverTime", "{0:yyyy-MM-dd}")%>")' ><%#Eval("Gongzuokaoping").ToString()==""?"淇敼宸ヤ綔鑰冭瘎":Eval("Gongzuokaoping")%> </a>
+ </td>
+
+ <%-- <td>
+ <a href='javascript:void(0)' title='鎵撳嵃閫佽揣鍗�' class='a_under' onclick='ToPrintDriverorder("<%#Eval("Keyid")%>")'> 鎵撳嵃 </a>
+ </td>--%>
+ <td>
+ <a href='javascript:void(0)' title='閫佽揣鍗曞浘鐗�' class='a_under' onclick='onViewuplod("<%#Eval("Keyid")%>")'> <%#Eval("SonghuodanTupian")%> </a>
+ </td>
+
+ <td style="text-align: center;">
+ <a href='javascript:void(0)' title='鐐瑰嚮淇敼绉讳氦' class='a_under' onclick='danjuyijiao("<%#Eval("Keyid")%>","<%#Eval("Transferstatus")%>")'> <%#Eval("TransferName")==null || Eval("TransferName").ToString()==""?"鏈Щ浜�":Eval("TransferName")%> </a>
+
+
+ </td>
+ <td style="text-align: center;">
+
+ <a href='javascript:void(0)' title='鐐瑰嚮淇敼' class='a_under' onclick='Xiugai("<%#Eval("Keyid")%>","<%#Eval("Transferstatus")%>")'> 淇敼 </a>
+
+
+ <a href='javascript:void(0)' title='鐐瑰嚮鎾ゅ洖' class='a_under' onclick='chehui("<%#Eval("Keyid")%>","<%#Eval("Transferstatus")%>")'> 鎾ゅ洖 </a>
+
+
+ </td>
+ </tr>
+ </itemtemplate>
+ </asp:repeater>
+
+ </tbody>
+ </table>
+ <uc:ucpager id="UCPager1" runat="server" />
+ </div>
+ </div>
+ </form>
+</body>
+</html>
+
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheList.aspx.cs
new file mode 100644
index 0000000..f3b44c4
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheList.aspx.cs
@@ -0,0 +1,543 @@
+锘縰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.Model;
+using CY.Infrastructure.Query;
+using CY.Infrastructure.Common;
+using CY.BLL.Sys;
+using CY.BLL.OA;
+using CY.BLL.EC;
+using CY.BLL.Inquiry;
+using CY.Model.Inquiry;
+using System.Drawing;
+using CY.Infrastructure.Logging;
+using CY.SQLDAL;
+using CY.Model.OA;
+using System.Data.SqlClient;
+
+namespace CY.WebForm.Pages.business
+{
+ public partial class DeliverPlanPaicheList : BasePage
+ {
+
+ OA_DeliverPlanPaicheBLL _OA_DeliverPlanPaicheBLL = null;
+ OA_StaffBLL bll_OA_StaffBLL = null;
+ OA_CarManageBll _OA_CarManageBll = null;
+
+
+
+ //鍒濆鍖�
+ public DeliverPlanPaicheList()
+ {
+
+ _OA_DeliverPlanPaicheBLL = new OA_DeliverPlanPaicheBLL();
+ bll_OA_StaffBLL = new OA_StaffBLL();
+ _OA_CarManageBll = new OA_CarManageBll();
+
+ }
+
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ UCPager1.AspNetPager.PageChanged += AspNetPager1_PageChanged;
+ if (!IsPostBack)
+ {
+
+
+
+ switch (Request["Target"])
+ {
+
+ case "AcceptOrderAll":
+ AcceptAll();
+ break;
+ case "AcceptOrderAll2":
+ AcceptAll2();
+ break;
+ default:
+ InitialSelectData();
+ BindList();
+ return;
+ }
+ Response.End();
+ }
+ }
+
+
+ //鍔犺浇鏌ヨ鏉′欢
+ protected void InitialSelectData()
+ {
+ //this.selDriverId.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, null, null).Where(x => x.BF_IsDriver == true);//.Where(x => x.SM_Post.Equals("椹鹃┒鍛�")) ;
+ //this.selDriverId.DataTextField = "Name";
+ //this.selDriverId.DataValueField = "Keyid";
+ //this.selDriverId.DataBind();
+ //this.selDriverId.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+
+ this.selCarId.DataSource = _OA_CarManageBll.SelectListByFirmId(CurrentUser.MemberId);
+ this.selCarId.DataTextField = "CarNumber";
+ this.selCarId.DataValueField = "Keyid";
+ this.selCarId.DataBind();
+ this.selCarId.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+
+
+ this.selBusinessManager.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, true, false);
+ this.selBusinessManager.DataTextField = "Name";
+ this.selBusinessManager.DataValueField = "Keyid";
+ this.selBusinessManager.DataBind();
+ this.selBusinessManager.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+
+
+ //this.selDriverIddo.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, null, null).Where(x => x.BF_IsDriver == true);//.Where(x => x.SM_Post.Equals("椹鹃┒鍛�"));
+ //this.selDriverIddo.DataTextField = "Name";
+ //this.selDriverIddo.DataValueField = "Keyid";
+ //this.selDriverIddo.DataBind();
+ //this.selDriverIddo.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+
+ //this.selCarIddo.DataSource = _OA_CarManageBll.SelectListByFirmId(CurrentUser.MemberId);
+ //this.selCarIddo.DataTextField = "CarNumber";
+ //this.selCarIddo.DataValueField = "Keyid";
+ //this.selCarIddo.DataBind();
+ //this.selCarIddo.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+
+ //this.Button0.Text = "閫炬湡";
+ this.Button1.Text = DateTime.Now.ToString("yyyy-MM-dd");
+ this.Button2.Text = DateTime.Now.AddDays(1).ToString("yyyy-MM-dd");
+ this.Button3.Text = DateTime.Now.AddDays(2).ToString("yyyy-MM-dd");
+ this.Button4.Text = DateTime.Now.AddDays(3).ToString("yyyy-MM-dd");
+ this.Button5.Text = DateTime.Now.AddDays(4).ToString("yyyy-MM-dd");
+ this.Button6.Text = DateTime.Now.AddDays(5).ToString("yyyy-MM-dd");
+ this.Button7.Text = "涓�鍛ㄥ悗";/*DateTime.Now.AddDays(6).ToString("yyyy-MM-dd");*/
+
+ this.selSonghuo.Value = "2";
+
+
+ //this.DriverId.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, null, null).Where(x => x.SM_Post.Equals("椹鹃┒鍛�"));
+ //this.DriverId.DataTextField = "Name";
+ //this.DriverId.DataValueField = "Keyid";
+ //this.DriverId.DataBind();
+ //this.DriverId.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+
+ //this.CarId.DataSource = _OA_CarManageBll.SelectListByFirmId(CurrentUser.MemberId);
+ //this.CarId.DataTextField = "CarNumber";
+ //this.CarId.DataValueField = "Keyid";
+ //this.CarId.DataBind();
+ //this.CarId.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+
+ }
+
+ //鍒嗛〉浜嬩欢
+ protected void AspNetPager1_PageChanged(object src, EventArgs e)
+ {
+ BindList();
+ }
+
+ //鏌ヨ浜嬩欢
+ protected void btn_Search_Click(object sender, EventArgs e)
+ {
+ BindList();
+ }
+ protected void btn_Search_Click0(object sender, EventArgs e)
+ {
+
+ //this.txtDeliveryTime.Value = this.Button0.Text;
+
+ BindList();
+ }
+
+ protected void btn_Search_Click1(object sender, EventArgs e)
+ {
+
+ this.txtDeliveryTime.Value = this.Button1.Text;
+
+ BindList();
+ }
+ protected void btn_Search_Click2(object sender, EventArgs e)
+ {
+
+ this.txtDeliveryTime.Value = this.Button2.Text;
+
+ BindList();
+ }
+ protected void btn_Search_Click3(object sender, EventArgs e)
+ {
+
+ this.txtDeliveryTime.Value = this.Button3.Text;
+
+ BindList();
+ }
+ protected void btn_Search_Click4(object sender, EventArgs e)
+ {
+
+ this.txtDeliveryTime.Value = this.Button4.Text;
+
+ BindList();
+ }
+ protected void btn_Search_Click5(object sender, EventArgs e)
+ {
+
+ this.txtDeliveryTime.Value = this.Button5.Text;
+
+ BindList();
+ }
+ protected void btn_Search_Click6(object sender, EventArgs e)
+ {
+
+ this.txtDeliveryTime.Value = this.Button6.Text;
+
+ BindList();
+ }
+ protected void btn_Search_Click7(object sender, EventArgs e)
+ {
+
+ this.txtDeliveryTime.Value = this.Button7.Text;
+
+ BindList();
+ }
+
+ //缁戝畾鍒楄〃
+ private void BindList()
+ {
+ //EC_OrderBLL eC_OrderBLL = new EC_OrderBLL();
+ //Pagination pa1 = new Pagination();
+ //pa1.PageSize = 1000;
+ //pa1.PageIndex = 1;
+ //IEnumerable<OA_DeliverPlan> oA_DeliverPlans1 = eC_OrderBLL.GetshoukuantixingList(pa1,CurrentUser.MemberId, "", "", "", "", "", "", "");
+
+
+ if (this.txtDeliveryTime.Value == "")
+ {
+ this.txtDeliveryTime.Value = this.Button1.Text;
+ }
+ if(this.txtDeliveryTime.Value == this.Button1.Text)
+ {
+ this.Button1.BorderColor = Color.Black;
+ this.Button2.BorderColor = Color.LightBlue;
+ this.Button3.BorderColor = Color.LightBlue;
+ this.Button4.BorderColor = Color.LightBlue;
+ this.Button5.BorderColor = Color.LightBlue;
+ this.Button6.BorderColor = Color.LightBlue;
+ this.Button7.BorderColor = Color.LightBlue;
+ //this.Button0.BorderColor = Color.LightBlue;
+ }
+ else if (this.txtDeliveryTime.Value == this.Button2.Text)
+ {
+ this.Button2.BorderColor = Color.Black;
+ this.Button1.BorderColor = Color.LightBlue;
+ this.Button3.BorderColor = Color.LightBlue;
+ this.Button4.BorderColor = Color.LightBlue;
+ this.Button5.BorderColor = Color.LightBlue;
+ this.Button6.BorderColor = Color.LightBlue;
+ this.Button7.BorderColor = Color.LightBlue;
+ //this.Button0.BorderColor = Color.LightBlue;
+ }
+ else if (this.txtDeliveryTime.Value == this.Button3.Text)
+ {
+ this.Button3.BorderColor = Color.Black;
+ this.Button2.BorderColor = Color.LightBlue;
+ this.Button1.BorderColor = Color.LightBlue;
+ this.Button4.BorderColor = Color.LightBlue;
+ this.Button5.BorderColor = Color.LightBlue;
+ this.Button6.BorderColor = Color.LightBlue;
+ this.Button7.BorderColor = Color.LightBlue;
+ //this.Button0.BorderColor = Color.LightBlue;
+ }
+ else if (this.txtDeliveryTime.Value == this.Button4.Text)
+ {
+ this.Button4.BorderColor = Color.Black;
+ this.Button2.BorderColor = Color.LightBlue;
+ this.Button3.BorderColor = Color.LightBlue;
+ this.Button1.BorderColor = Color.LightBlue;
+ this.Button5.BorderColor = Color.LightBlue;
+ this.Button6.BorderColor = Color.LightBlue;
+ this.Button7.BorderColor = Color.LightBlue;
+ //this.Button0.BorderColor = Color.LightBlue;
+ }
+ else if (this.txtDeliveryTime.Value == this.Button5.Text)
+ {
+ this.Button5.BorderColor = Color.Black;
+ this.Button2.BorderColor = Color.LightBlue;
+ this.Button3.BorderColor = Color.LightBlue;
+ this.Button4.BorderColor = Color.LightBlue;
+ this.Button1.BorderColor = Color.LightBlue;
+ this.Button6.BorderColor = Color.LightBlue;
+ this.Button7.BorderColor = Color.LightBlue;
+ //this.Button0.BorderColor = Color.LightBlue;
+ }
+ else if (this.txtDeliveryTime.Value == this.Button6.Text)
+ {
+ this.Button6.BorderColor = Color.Black;
+ this.Button2.BorderColor = Color.LightBlue;
+ this.Button3.BorderColor = Color.LightBlue;
+ this.Button4.BorderColor = Color.LightBlue;
+ this.Button5.BorderColor = Color.LightBlue;
+ this.Button1.BorderColor = Color.LightBlue;
+ this.Button7.BorderColor = Color.LightBlue;
+ //this.Button0.BorderColor = Color.LightBlue;
+ }
+ else if (this.txtDeliveryTime.Value == this.Button7.Text)
+ {
+ this.Button7.BorderColor = Color.Black;
+ this.Button2.BorderColor = Color.LightBlue;
+ this.Button3.BorderColor = Color.LightBlue;
+ this.Button4.BorderColor = Color.LightBlue;
+ this.Button5.BorderColor = Color.LightBlue;
+ this.Button6.BorderColor = Color.LightBlue;
+ this.Button1.BorderColor = Color.LightBlue;
+ //this.Button0.BorderColor = Color.LightBlue;
+ }
+ //else if (this.txtDeliveryTime.Value == this.Button0.Text)
+ //{
+ // this.Button0.BorderColor = Color.Black;
+ // this.Button2.BorderColor = Color.LightBlue;
+ // this.Button3.BorderColor = Color.LightBlue;
+ // this.Button4.BorderColor = Color.LightBlue;
+ // this.Button5.BorderColor = Color.LightBlue;
+ // this.Button6.BorderColor = Color.LightBlue;
+ // this.Button1.BorderColor = Color.LightBlue;
+ // this.Button7.BorderColor = Color.LightBlue;
+ //}
+
+
+ Pagination pa = new Pagination();
+ pa.PageSize = UCPager1.AspNetPager.PageSize;
+ pa.PageIndex = UCPager1.AspNetPager.CurrentPageIndex;
+
+ IEnumerable<OA_DeliverPlan> oA_DeliverPlans = _OA_DeliverPlanPaicheBLL.SelectModelPage(pa,
+ CurrentUser.MemberId,
+ this.txtDeliveryTime.Value,
+ this.selCarId.Value,
+ "",
+ this.txtBeginDate.Value,
+ this.txtEndDate.Value,
+ "",
+ this.txtCustormerName.Value.Trim(),
+ this.selBusinessManager.Value,
+ this.selSonghuo.Value
+ );
+
+ Database DC = new Database();
+
+
+
+
+ try
+ {
+ List<OA_CorporateClientsContract> fileDataList = null;
+ foreach (var oA_DeliverPlan in oA_DeliverPlans)
+ {
+ oA_DeliverPlan.SonghuodanTupian = "鏆傛棤";
+
+ string sqlStr = string.Format(@" select * from [dbo].[OA_attachment] where [OA_Id]='{0}' and [AttachmentType]=3 order by [CreateTime] ", oA_DeliverPlan.Keyid);
+
+ SqlCommand myCmd = new SqlCommand(sqlStr, DC.Connection);
+ //SqlDataAdapter myDa = new SqlDataAdapter(myCmd);
+ var a = myCmd.ExecuteReader();
+ //myDa.Dispose();
+ fileDataList = new List<OA_CorporateClientsContract>();
+ OA_CorporateClientsContract Contract;
+ var i = 1;
+ while (a.Read())
+ { //娉ㄦ剰濡備綍灏嗘瘡娆¤鍙栧埌鐨勮褰曟坊鍔犲埌listbox1涓紙鍥犱负绗竴娆″仛鏃跺嚭閿欎簡锛屽樋鍢匡級
+ Contract = new OA_CorporateClientsContract();
+ // Contract.Keyid = a.GetInt32(0);
+ //Contract.CorporateClientsid = a.GetGuid(1);
+ //Contract.CorporateClientsName = a.GetString(4);
+ Contract.FileName = a[4].ToString();
+ Contract.PageCode = i;
+ Contract.FilePath = a.GetString(2);
+ // Contract.Remark = a.GetString(6);
+ i += 1;
+
+ fileDataList.Add(Contract);
+ }
+ a.Close(); //鍏抽棴sqldatareader
+
+ if (fileDataList.Count > 0)
+ {
+ oA_DeliverPlan.SonghuodanTupian = "<img src=\"" + fileDataList[0].FilePath+ "\" width=\"20\" height=\"20\" >";
+ }
+ }
+ }
+ catch (Exception ee)
+ {
+ new Log4NetAdapter().Log("鏌ユ壘閫佽揣鍗曞浘鐗囧嚭閿欙細" + ee.Message);
+
+ }
+ finally
+ {
+ if (DC.Connection.State != System.Data.ConnectionState.Closed)
+ DC.Connection.Close();
+ }
+
+
+
+
+
+ this.RepClientList.DataSource = oA_DeliverPlans;
+
+
+
+ this.RepClientList.DataBind();
+ UCPager1.AspNetPager.RecordCount = pa.RecordCount;
+ }
+
+ /// <summary>
+ /// 鎵归噺鍙楃悊璁㈠崟
+ /// </summary>
+ public void AcceptAll()
+ {
+ Response.Clear();
+
+ string ids = string.Empty;
+ string DeliverTimes = string.Empty;
+ string BuyerIds = string.Empty;
+ if (Request["ids"] != null)
+ {
+ ids = Request["ids"].ToString();
+ }
+ if (Request["DeliverTimes"] != null)
+ {
+ DeliverTimes = Request["DeliverTimes"].ToString();
+ }
+ if (Request["BuyerIds"] != null)
+ {
+ BuyerIds = Request["BuyerIds"].ToString();
+ }
+
+ string[] idsArray = ids.Split(',');
+ string[] DeliverTimesArray = DeliverTimes.Split(',');
+ string[] BuyerIdsArray = BuyerIds.Split(',');
+
+ if(idsArray!=null&& idsArray.Length > 0)
+ {
+ for(int i = 0; i < idsArray.Length; i++)
+ {
+ bool result = true;
+
+ OA_DeliverPlan oA_DeliverPlan = _OA_DeliverPlanPaicheBLL.GetModelByKeyid(idsArray[i].ToGuid2(), BuyerIdsArray[i].ToGuid2(), DeliverTimesArray[i].ToDateTime2());
+ if (oA_DeliverPlan == null)
+ {
+ oA_DeliverPlan = new OA_DeliverPlan();
+ oA_DeliverPlan.Keyid = Guid.NewGuid();
+ oA_DeliverPlan.FirmId = CurrentUser.MemberId;
+ oA_DeliverPlan.DeliverTime = DeliverTimesArray[i].ToDateTime2();
+ oA_DeliverPlan.BuyerId = BuyerIdsArray[i].ToGuid2();
+ oA_DeliverPlan.DeliveredTime = null;
+ oA_DeliverPlan.Zhuyishixiang = "";
+ oA_DeliverPlan.Gongzuokaoping = "";
+ oA_DeliverPlan.CarId = 0;
+ oA_DeliverPlan.DriverId = 0;
+ oA_DeliverPlan.Transferstatus = 2;
+ oA_DeliverPlan.TransfersTime = DateTime.Now;
+ oA_DeliverPlan.Sort = 1;
+ oA_DeliverPlan.Creater = CurrentUser.TrueMemberId;
+ oA_DeliverPlan.CreateTime = DateTime.Now;
+ oA_DeliverPlan.Updater = CurrentUser.TrueMemberId;
+ oA_DeliverPlan.LastUpdateTime = DateTime.Now;
+ oA_DeliverPlan.wentifankui = "";
+ result = _OA_DeliverPlanPaicheBLL.InsertModel(oA_DeliverPlan);
+ }
+ else
+ {
+ oA_DeliverPlan.Transferstatus = 2;
+ oA_DeliverPlan.TransfersTime = DateTime.Now;
+ result = _OA_DeliverPlanPaicheBLL.UpdateModel(oA_DeliverPlan);
+ }
+ if (!result)
+ {
+ //BindList();
+ Response.Write("-2");
+ return;
+ }
+ }
+ }
+ // BindList();
+ Response.Write("1");
+
+
+
+ }
+
+
+ /// <summary>
+ /// 鎵归噺娲捐溅
+ /// </summary>
+ public void AcceptAll2()
+ {
+ Response.Clear();
+ int? carid = Request["CarId"].ToInt32(); //this.CarId.Value.ToGuid2();
+ int? driverId = Request["DriverId"].ToInt32(); //this.DriverId.Value.ToGuid2();
+ string ids = string.Empty;
+ string DeliverTimes = string.Empty;
+ string BuyerIds = string.Empty;
+ if (Request["ids"] != null)
+ {
+ ids = Request["ids"].ToString();
+ }
+ if (Request["DeliverTimes"] != null)
+ {
+ DeliverTimes = Request["DeliverTimes"].ToString();
+ }
+ if (Request["BuyerIds"] != null)
+ {
+ BuyerIds = Request["BuyerIds"].ToString();
+ }
+
+ string[] idsArray = ids.Split(',');
+ string[] DeliverTimesArray = DeliverTimes.Split(',');
+ string[] BuyerIdsArray = BuyerIds.Split(',');
+
+ if (idsArray != null && idsArray.Length > 0)
+ {
+ for (int i = 0; i < idsArray.Length; i++)
+ {
+ bool result = true;
+
+ OA_DeliverPlan oA_DeliverPlan = _OA_DeliverPlanPaicheBLL.GetModelByKeyid(idsArray[i].ToGuid2(), BuyerIdsArray[i].ToGuid2(), DeliverTimesArray[i].ToDateTime2());
+ if (oA_DeliverPlan == null)
+ {
+ oA_DeliverPlan = new OA_DeliverPlan();
+ oA_DeliverPlan.Keyid = Guid.NewGuid();
+ oA_DeliverPlan.FirmId = CurrentUser.MemberId;
+ oA_DeliverPlan.DeliverTime = DeliverTimesArray[i].ToDateTime2();
+ oA_DeliverPlan.BuyerId = BuyerIdsArray[i].ToGuid2();
+ oA_DeliverPlan.DeliveredTime = null;
+ oA_DeliverPlan.Zhuyishixiang = "";
+ oA_DeliverPlan.Gongzuokaoping = "";
+ oA_DeliverPlan.CarId = carid;
+ oA_DeliverPlan.DriverId = driverId;
+ oA_DeliverPlan.Transferstatus = 1;
+ oA_DeliverPlan.TransfersTime = null;
+ oA_DeliverPlan.Sort = 1;
+ oA_DeliverPlan.Creater = CurrentUser.TrueMemberId;
+ oA_DeliverPlan.CreateTime = DateTime.Now;
+ oA_DeliverPlan.Updater = CurrentUser.TrueMemberId;
+ oA_DeliverPlan.LastUpdateTime = DateTime.Now;
+ oA_DeliverPlan.wentifankui = "";
+ result = _OA_DeliverPlanPaicheBLL.InsertModel(oA_DeliverPlan);
+ }
+ else
+ {
+ oA_DeliverPlan.CarId = carid;
+ oA_DeliverPlan.DriverId = driverId;
+ result = _OA_DeliverPlanPaicheBLL.UpdateModel(oA_DeliverPlan);
+ }
+ if (!result)
+ {
+ // BindList();
+ Response.Write("-2");
+ return;
+ }
+ }
+ }
+ //BindList();
+ Response.Write("1");
+
+
+
+ }
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheList.aspx.designer.cs
new file mode 100644
index 0000000..e2a575d
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheList.aspx.designer.cs
@@ -0,0 +1,197 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.business
+{
+
+
+ public partial class DeliverPlanPaicheList
+ {
+
+ /// <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>
+ /// Button1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button Button1;
+
+ /// <summary>
+ /// Button2 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button Button2;
+
+ /// <summary>
+ /// Button3 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button Button3;
+
+ /// <summary>
+ /// Button4 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button Button4;
+
+ /// <summary>
+ /// Button5 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button Button5;
+
+ /// <summary>
+ /// Button6 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button Button6;
+
+ /// <summary>
+ /// Button7 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button Button7;
+
+ /// <summary>
+ /// txtDeliveryTime 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputHidden txtDeliveryTime;
+
+ /// <summary>
+ /// selSonghuo 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selSonghuo;
+
+ /// <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>
+ /// txtCustormerName 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtCustormerName;
+
+ /// <summary>
+ /// selBusinessManager 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selBusinessManager;
+
+ /// <summary>
+ /// selCarId 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selCarId;
+
+ /// <summary>
+ /// btn_Search 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button btn_Search;
+
+ /// <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/DeliverPlanPaicheZhuyishixiang.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheZhuyishixiang.aspx
new file mode 100644
index 0000000..3088f6f
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheZhuyishixiang.aspx
@@ -0,0 +1,49 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DeliverPlanPaicheZhuyishixiang.aspx.cs" Inherits="CY.WebForm.Pages.business.DeliverPlanPaicheZhuyishixiang" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+ <title>閫佽揣瀹夋帓娉ㄦ剰浜嬮」</title>
+ <uc:CMSHead ID="CMSHead1" runat="server" />
+ <script src="../../js/business/Custom.js" type="text/javascript"></script>
+ <script type="text/javascript">
+
+
+
+ </script>
+</head>
+<body>
+ <form runat="server" id="form1" class="form2">
+ <fieldset>
+ <legend>鍩烘湰淇℃伅</legend>
+ <table class="tableStyle" width="100%">
+ <tr>
+ <td class="ali03 ">娉ㄦ剰浜嬮」锛�</td>
+
+ <td style=" text-align:left;">
+ <textarea id="txtZhuyishixiang" name="txtZhuyishixiang" runat="server" style="width: 692px; height: 30px;" class="req" maxlength="200"></textarea>
+ </td>
+
+ </tr>
+ <tr>
+
+
+ <td class="ali02" colspan="2">
+
+ <asp:Button ID="btn_Submit" Text="淇濆瓨" runat="server" OnClick="btn_Submit_Config" />
+
+ <input type="hidden" id="HideKeyid" runat="server" /></td>
+ <input type="hidden" id="HideDeliverTime" runat="server" /></td>
+ <input type="hidden" id="HideBuyerId" runat="server" /></td>
+ </tr>
+ </table>
+ </fieldset>
+
+
+ </form>
+</body>
+<script type="text/javascript">
+
+</script>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheZhuyishixiang.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheZhuyishixiang.aspx.cs
new file mode 100644
index 0000000..2b68588
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheZhuyishixiang.aspx.cs
@@ -0,0 +1,127 @@
+锘縰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.Model;
+using CY.Infrastructure.Query;
+using CY.Infrastructure.Common;
+using CY.BLL.Sys;
+using System.Text;
+using CY.BLL.OA;
+using CY.BLL.EC;
+
+namespace CY.WebForm.Pages.business
+{
+ public partial class DeliverPlanPaicheZhuyishixiang : BasePage
+ {
+ OA_DeliverPlanPaicheBLL oA_DeliverPlanBLL = null;
+
+ public DeliverPlanPaicheZhuyishixiang()
+ {
+
+ oA_DeliverPlanBLL = new OA_DeliverPlanPaicheBLL();
+
+ }
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ try
+ {
+ if (!IsPostBack)
+ {
+ this.HideKeyid.Value = Request["Keyid"].ToString2();
+
+
+ this.HideDeliverTime.Value = Request["DeliverTime"].ToString2();
+ this.HideBuyerId.Value = Request["BuyerId"].ToString2();
+
+ OA_DeliverPlan oA_DeliverPlan = oA_DeliverPlanBLL.GetModelByKeyid(Request["Keyid"].ToGuid2(), Request["BuyerId"].ToGuid2(), Request["DeliverTime"].ToDateTime2());
+ if (oA_DeliverPlan != null)
+ {
+ this.txtZhuyishixiang.Value = oA_DeliverPlan.Remark ;
+ }
+
+
+ }
+
+
+ }
+ catch (Exception ex)
+ {
+ PAGEHandleException(ex);
+ Response.Clear();
+ Response.Write("-1");
+ }
+ //Response.End();
+ }
+
+
+ //鎻愪氦浜嬩欢
+ protected void btn_Submit_Config(object sender, EventArgs e)
+ {
+
+
+ try
+ {
+
+
+ Guid Keyid = this.HideKeyid.Value.ToGuid2();
+ Guid BuyerId = this.HideBuyerId.Value.ToGuid2();
+ DateTime DeliverTime = this.HideDeliverTime.Value.ToDateTime2().Value;
+ string Zhuyishixiang = this.txtZhuyishixiang.Value;
+ bool result = true;
+
+ OA_DeliverPlan oA_DeliverPlan = oA_DeliverPlanBLL.GetModelByKeyid(Keyid, BuyerId, DeliverTime);
+ if (oA_DeliverPlan == null)
+ {
+ oA_DeliverPlan = new OA_DeliverPlan();
+ oA_DeliverPlan.Keyid = Guid.NewGuid();
+ oA_DeliverPlan.FirmId = CurrentUser.MemberId;
+ oA_DeliverPlan.DeliverTime = DeliverTime;
+ oA_DeliverPlan.BuyerId = BuyerId;
+ oA_DeliverPlan.DeliveredTime = null;
+ oA_DeliverPlan.Zhuyishixiang = Zhuyishixiang;
+ oA_DeliverPlan.Remark = Zhuyishixiang;
+ oA_DeliverPlan.Gongzuokaoping = "";
+ oA_DeliverPlan.CarId = 0;
+ oA_DeliverPlan.DriverId = 0;
+ oA_DeliverPlan.Transferstatus = 1;
+ oA_DeliverPlan.TransfersTime = null;
+ oA_DeliverPlan.Sort = 1;
+ oA_DeliverPlan.Creater = CurrentUser.TrueMemberId;
+ oA_DeliverPlan.CreateTime = DateTime.Now;
+ oA_DeliverPlan.Updater = CurrentUser.TrueMemberId;
+ oA_DeliverPlan.LastUpdateTime = DateTime.Now;
+ oA_DeliverPlan.wentifankui = "";
+ result = oA_DeliverPlanBLL.InsertModel(oA_DeliverPlan);
+ }
+ else
+ {
+ oA_DeliverPlan.Zhuyishixiang = Zhuyishixiang;
+ oA_DeliverPlan.Remark = Zhuyishixiang;
+ oA_DeliverPlan.Updater = CurrentUser.TrueMemberId;
+ oA_DeliverPlan.LastUpdateTime = DateTime.Now;
+ result = oA_DeliverPlanBLL.UpdateModel(oA_DeliverPlan);
+ }
+
+
+
+
+
+
+ if (result)
+ JavaScript.MessageBox("鏇存柊鎴愬姛", this, true, true);
+ else
+ JavaScript.MessageBox("鏇存柊澶辫触", this);
+
+ }
+ catch (Exception ex)
+ {
+ PAGEHandleException(ex);
+ JavaScript.MessageBox("鎿嶄綔澶辫触", this);
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheZhuyishixiang.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheZhuyishixiang.aspx.designer.cs
new file mode 100644
index 0000000..e575efc
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheZhuyishixiang.aspx.designer.cs
@@ -0,0 +1,80 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.business
+{
+
+
+ public partial class DeliverPlanPaicheZhuyishixiang
+ {
+
+ /// <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>
+ /// txtZhuyishixiang 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlTextArea txtZhuyishixiang;
+
+ /// <summary>
+ /// btn_Submit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button btn_Submit;
+
+ /// <summary>
+ /// HideKeyid 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputHidden HideKeyid;
+
+ /// <summary>
+ /// HideDeliverTime 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputHidden HideDeliverTime;
+
+ /// <summary>
+ /// HideBuyerId 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputHidden HideBuyerId;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPrint.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPrint.aspx.cs
index 2c5d8a9..d628ef5 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPrint.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPrint.aspx.cs
@@ -64,6 +64,8 @@
string BusinessManager = Request["BusinessManager"].ToString2();
+ string Paiche = Request["Paiche"].ToString2();
+
IEnumerable<OA_DeliverPlan> oA_DeliverPlans = _OA_DeliverPlanBLL.SelectModelPage(pa,
CurrentUser.MemberId,
DeliverTime,
@@ -71,7 +73,8 @@
DriverId,
"",
CustormerName,
- BusinessManager
+ BusinessManager,
+ Paiche
);
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanSort.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanSort.aspx.cs
index 4efc199..a51ee81 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanSort.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanSort.aspx.cs
@@ -17,12 +17,12 @@
{
public partial class DeliverPlanSort : BasePage
{
- OA_DeliverPlanBLL oA_DeliverPlanBLL = null;
+ OA_DeliverPlanPaicheBLL oA_DeliverPlanBLL = null;
public DeliverPlanSort()
{
- oA_DeliverPlanBLL = new OA_DeliverPlanBLL();
+ oA_DeliverPlanBLL = new OA_DeliverPlanPaicheBLL();
}
protected void Page_Load(object sender, EventArgs e)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanYijiao.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanYijiao.aspx.cs
index ab0bd5e..b31018f 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanYijiao.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanYijiao.aspx.cs
@@ -30,7 +30,7 @@
public partial class DeliverPlanYijiao : BasePage
{
- OA_DeliverPlanBLL _OA_DeliverPlanBLL = null;
+ OA_DeliverPlanPaicheBLL _OA_DeliverPlanBLL = null;
OA_StaffBLL bll_OA_StaffBLL = null;
OA_CarManageBll _OA_CarManageBll = null;
@@ -39,7 +39,7 @@
public DeliverPlanYijiao()
{
- _OA_DeliverPlanBLL = new OA_DeliverPlanBLL();
+ _OA_DeliverPlanBLL = new OA_DeliverPlanPaicheBLL();
bll_OA_StaffBLL = new OA_StaffBLL();
_OA_CarManageBll = new OA_CarManageBll();
@@ -92,16 +92,39 @@
{
- this.IsBusinessManager.Items.Add(new ListItem("涓氬姟缁忕悊", "1"));
- this.IsBusinessManager.Items.Add(new ListItem("宸ュ巶鐗╂祦閮�", "2"));
+
- this.IsBusinessManager.SelectedValue = "1";
+
- string keyid = Request["keyid"];
+ string ids = Request["ids"];
+ var deliverPlan = _OA_DeliverPlanBLL.GetModelByKeyid(ids.ToGuid2(), null, null);
+ if (deliverPlan.Transferstatus.HasValue && deliverPlan.Transferstatus != 0)
+ {
+ if(deliverPlan.TransferType.Value == 1)
+ {
+ this.IsBusinessManager.Items.Add(new ListItem(deliverPlan.TransferName, "1"));
+ this.IsBusinessManager.Items.Add(new ListItem("宸ュ巶鐗╂祦閮�", "2"));
+ this.IsBusinessManager.SelectedValue = deliverPlan.Transferstatus.Value.ToString();
+ }
+ else
+ {
+ this.IsBusinessManager.Items.Add(new ListItem("涓氬姟缁忕悊", "1"));
+ this.IsBusinessManager.Items.Add(new ListItem("宸ュ巶鐗╂祦閮�", "2"));
+ this.IsBusinessManager.SelectedValue = "1";
+ }
+
+
+ }
+ else
+ {
+ this.IsBusinessManager.Items.Add(new ListItem("涓氬姟缁忕悊", "1"));
+ this.IsBusinessManager.Items.Add(new ListItem("宸ュ巶鐗╂祦閮�", "2"));
+ this.IsBusinessManager.SelectedValue = "1";
+ }
@@ -210,11 +233,11 @@
}
- var carManage = _OA_CarManageBll.SelectListByFirmId(CurrentUser.MemberId).Where(x => x.StaffID == deliverPlan.DriverId).FirstOrDefault();
- if (carManage != null)
- {
- deliverPlan.CarId = carManage.Keyid ?? 0;
- }
+ //var carManage = _OA_CarManageBll.SelectListByFirmId(CurrentUser.MemberId).Where(x => x.StaffID == deliverPlan.DriverId).FirstOrDefault();
+ //if (carManage != null)
+ //{
+ // deliverPlan.CarId = carManage.Keyid ?? 0;
+ //}
isWin = _OA_DeliverPlanBLL.UpdateModel(deliverPlan);
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
index 0343f7d..9440fb6 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
@@ -17,7 +17,7 @@
function jsPrice(dj) {
var num = $("#printCount").val();
- $("#txtSumPrice").val(dj * num);
+ $("#txtSumPrice").val((dj * num).toFixed(4));
}
function jsdjPrice(zj) {
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProdactionList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProdactionList.aspx
index 9c07715..71d1ff8 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProdactionList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProdactionList.aspx
@@ -67,10 +67,10 @@
</tr>
<tr>
- <td class="ali03">
+ <td class="ali03" style="display:none;">
鎵�鍦ㄥ尯鍩燂細
</td>
- <td>
+ <td style="display:none;">
<asp:DropDownList ID="selectProvince" runat="server" keepDefaultStyle="true" AutoPostBack="true" OnSelectedIndexChanged="ChangeProvince" Width="70px">
</asp:DropDownList>
<asp:DropDownList ID="selectCity" runat="server" keepDefaultStyle="true" AutoPostBack="true" OnSelectedIndexChanged="ChangeCity" Width="70px">
@@ -105,7 +105,7 @@
</td>
<td>
</td>
- <td>
+ <td colspan="3">
<asp:button id="btn_Search" text="鏌ヨ" runat="server" padding="0px" OnClick="btn_Search_Click" /> <input type="button" value='閲嶇疆' onclick='document.body.innerHTML="";window.location=window.location;' />
</td>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderSonghuoanchiList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderSonghuoanchiList.aspx
index 299a7fe..ee0f67a 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderSonghuoanchiList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderSonghuoanchiList.aspx
@@ -67,10 +67,10 @@
</tr>
<tr>
- <td class="ali03">
+ <td class="ali03" style="display:none;">
鎵�鍦ㄥ尯鍩燂細
</td>
- <td>
+ <td style="display:none;">
<asp:DropDownList ID="selectProvince" runat="server" keepDefaultStyle="true" AutoPostBack="true" OnSelectedIndexChanged="ChangeProvince" Width="70px">
</asp:DropDownList>
<asp:DropDownList ID="selectCity" runat="server" keepDefaultStyle="true" AutoPostBack="true" OnSelectedIndexChanged="ChangeCity" Width="70px">
@@ -105,7 +105,7 @@
</td>
<td>
</td>
- <td>
+ <td colspan="3">
<asp:button id="btn_Search" text="鏌ヨ" runat="server" padding="0px" OnClick="btn_Search_Click" /> <input type="button" value='閲嶇疆' onclick='document.body.innerHTML="";window.location=window.location;' />
</td>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/PrintAwbOrder.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/PrintAwbOrder.aspx.cs
index d1f0097..f9127a6 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/PrintAwbOrder.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/PrintAwbOrder.aspx.cs
@@ -223,7 +223,7 @@
oA_DeliverPlan.DeliverTime = DeliveryTime.HasValue? DeliveryTime: eC_OrderBasic.DeliveryTime;
oA_DeliverPlan.BuyerId = eC_OrderBasic.BuyerId;
oA_DeliverPlan.DeliveredTime = null;
- oA_DeliverPlan.Zhuyishixiang = "";
+ oA_DeliverPlan.Zhuyishixiang = Remark;
oA_DeliverPlan.Gongzuokaoping = "";
oA_DeliverPlan.CarId = 0;
oA_DeliverPlan.DriverId = 0;
@@ -238,7 +238,7 @@
oA_DeliverPlan.SellerOrderId = SellerOrderId;
oA_DeliverPlan.Dianhua = model.AccepterPhone;
oA_DeliverPlan.Dizhi = model.AccepterAddress;
- oA_DeliverPlan.Remark = "";
+ oA_DeliverPlan.Remark = Remark;
oA_DeliverPlan.BusinessManagerId = oA_CorporateClients.BusinessManagerId??0;
oA_DeliverPlan.Biddingcompany = oA_CorporateClients.Biddingcompany??0;
oA_DeliverPlan.CompanyName = oA_CorporateClients.CompanyName;
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx
index 99c4e08..878515e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx
@@ -23,7 +23,7 @@
</tr>
<tr>
<td class="ali03">涓氬姟缁忕悊锛�</td>
- <td> <select keepdefaultstyle='true' id='selBusinessManager' runat="server" datatextfield='Name' datavaluefield='Keyid'>
+ <td> <select keepdefaultstyle='true' class="sreq" id='selBusinessManager' runat="server" datatextfield='Name' datavaluefield='Keyid'>
</select></td>
</tr>
<tr>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx.cs
index fa22046..99049fc 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx.cs
@@ -56,7 +56,7 @@
this.selBusinessManager.DataTextField = "Name";
this.selBusinessManager.DataValueField = "Keyid";
this.selBusinessManager.DataBind();
- //this.selBusinessManager.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+ this.selBusinessManager.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
//this.selBusinessManager.Items.Insert(1, new ListItem(CurrentUser.ShortName, CurrentUser.ShortName));
decimal total = 0;
@@ -73,9 +73,13 @@
var model = bll_EC_OrderBasicBLL.SelectModelById(models[0].Keyid.Value);
name = models[0].BuyerName;
OA_CorporateClients oA_CorporateClients = _oA_CorporateClientsBLL.GetModel(models[0].BuyerId);
- if (oA_CorporateClients != null)
+ if (oA_CorporateClients != null && oA_CorporateClients.BusinessManagerId.HasValue && oA_CorporateClients.BusinessManagerId.Value>0)
{
this.selBusinessManager.Value = oA_CorporateClients.BusinessManagerId.HasValue ? oA_CorporateClients.BusinessManagerId.Value.ToString() : "";
+ }
+ else
+ {
+ JavaScript.MessageBox("璇风淮鎶ゅ鎴风殑涓氬姟缁忕悊", this);
}
}
@@ -117,6 +121,12 @@
/// </summary>
public void AcceptAll3()
{
+ if (string.IsNullOrEmpty(this.selBusinessManager.Value))
+ {
+ JavaScript.MessageBox("璇烽�夋嫨涓氬姟缁忕悊", this);
+ return;
+ }
+
string ids = this.txtOrderIds.Value;
string[] idsArray = ids.Split(',');
if (idsArray != null && idsArray.Length > 0)
--
Gitblit v1.9.1