From 006dca9a42fba209410906ef39e96912266f3561 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 19 三月 2026 09:05:38 +0800
Subject: [PATCH] 20260318 在司机后面把车牌号加上，如：“龚小虎（川G51020）” 送货计划的客户名称： 下单状态也查询
---
CY_ECommercePlatform/CY.BLL/OA/OA_CarManageBLL.cs | 31 +++++++++++++++
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs | 6 +-
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPai.aspx.cs | 16 ++++++-
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx.cs | 2
CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs | 4 +-
CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiEdit.aspx.cs | 15 ++++++-
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx.cs | 2
8 files changed, 65 insertions(+), 13 deletions(-)
diff --git a/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs b/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
index 546ff09..25ac75c 100644
--- a/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
@@ -298,9 +298,9 @@
/// </summary>
/// <param name="orderIds">璁㈠崟缂栧彿</param>
/// <returns></returns>
- public IEnumerable<EC_OrderBasic> GetOrderByPrintTypeId(int PrintTypeId)
+ public IEnumerable<EC_OrderBasic> GetOrderByPrintTypeId(int PrintTypeId, Guid MemberId)
{
- return _eC_OrderBasicDAL.GetOrderByPrintTypeId(PrintTypeId);
+ return _eC_OrderBasicDAL.GetOrderByPrintTypeId(PrintTypeId, MemberId);
}
/// <summary>
diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_CarManageBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_CarManageBLL.cs
index baf8787..6c3cf22 100644
--- a/CY_ECommercePlatform/CY.BLL/OA/OA_CarManageBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/OA/OA_CarManageBLL.cs
@@ -112,5 +112,36 @@
return oA_CarManages;
}
+
+
+
+ /// <summary>
+ /// 鏍规嵁鍘傚晢缂栧彿鑾峰彇鍛樺伐鍒楄〃
+ /// </summary>
+ /// <param name="FirmId"></param>
+ /// <param name="IsBusinessManager"></param>
+ /// <param name="IsAccountManager"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.OA_CarManage> SelectListByFirmIdnotstaff(Guid FirmId)
+ {
+ var oA_CarManages = iOA_CarManageDAL.SelectListByFirmId(FirmId);
+ //OA_StaffBLL _OA_StaffBLL = new OA_StaffBLL();
+ //foreach (var oA_CarManage in oA_CarManages)
+ //{
+ // if (oA_CarManage.StaffID.HasValue)
+ // {
+ // var oA_Staff = _OA_StaffBLL.GetModelByKeyid(oA_CarManage.StaffID);
+ // if (oA_Staff != null)
+ // {
+ // oA_CarManage.CarNumber = oA_CarManage.CarNumber + "(" + oA_Staff.Name + ")";
+ // }
+ // }
+
+
+ //}
+
+ return oA_CarManages;
+ }
+
}
}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs b/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs
index 8f6da91..1341c58 100644
--- a/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs
+++ b/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs
@@ -173,7 +173,7 @@
/// </summary>
/// <param name="orderIds">璁㈠崟缂栧彿</param>
/// <returns></returns>
- IEnumerable<EC_OrderBasic> GetOrderByPrintTypeId(int PrintTypeId);
+ IEnumerable<EC_OrderBasic> GetOrderByPrintTypeId(int PrintTypeId, Guid MemberId);
/// <summary>
diff --git a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
index 56cd407..5dcc001 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
@@ -1536,10 +1536,10 @@
/// </summary>
/// <param name="orderId">璁㈠崟缂栧彿</param>
/// <returns></returns>
- public IEnumerable<EC_OrderBasic> GetOrderByPrintTypeId(int PrintTypeId)
+ public IEnumerable<EC_OrderBasic> GetOrderByPrintTypeId(int PrintTypeId, Guid MemberId)
{
-
- IList<EC_OrderBasic> result = _dataBase.SelectModel<EC_OrderBasic>(" * ", "EC_OrderBasic ", string.Format(" PrintTypeId = {0} and (OrderState = 4 or OrderState = 2 or OrderState = 3 )", PrintTypeId));
+ //string sss = "EC_OrderBasic" + string.Format(" PrintTypeId = {0} and SellerId = '{1}' and OrderTypeId=1 and (OrderState = 4 or OrderState = 2 or OrderState = 3 or OrderState = 1)", PrintTypeId, MemberId.ToString());
+ IList<EC_OrderBasic> result = _dataBase.SelectModel<EC_OrderBasic>(" * ", "EC_OrderBasic ", string.Format(" PrintTypeId = {0} and SellerId = '{1}' and OrderTypeId=1 and (OrderState = 4 or OrderState = 2 or OrderState = 3 or OrderState = 1)", PrintTypeId, MemberId.ToString()));
return result;
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPai.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPai.aspx.cs
index e9749c8..0c79257 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPai.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPai.aspx.cs
@@ -99,9 +99,19 @@
-
-
- this.selCarId.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, false, false).Where(x => x.SM_Post == "鍙告満");
+ var staffs = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, false, false).Where(x => x.SM_Post == "鍙告満");
+ var oA_CarManages =_OA_CarManageBll.SelectListByFirmIdnotstaff(CurrentUser.MemberId);
+ foreach(var staff in staffs)
+ {
+ var oA_CarManage = oA_CarManages.Where(x => x.StaffID == staff.Keyid).FirstOrDefault();
+ {
+ if(oA_CarManage != null)
+ {
+ staff.Name = staff.Name + "(" + oA_CarManage.CarNumber + ")";
+ }
+ }
+ }
+ this.selCarId.DataSource = staffs;
this.selCarId.DataTextField = "Name";
this.selCarId.DataValueField = "Keyid";
this.selCarId.DataBind();
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiEdit.aspx.cs
index 25b5869..99439d1 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiEdit.aspx.cs
@@ -98,10 +98,21 @@
-
+ var staffs = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, false, false).Where(x => x.SM_Post == "鍙告満");
+ var oA_CarManages = _OA_CarManageBll.SelectListByFirmIdnotstaff(CurrentUser.MemberId);
+ foreach (var staff in staffs)
+ {
+ var oA_CarManage = oA_CarManages.Where(x => x.StaffID == staff.Keyid).FirstOrDefault();
+ {
+ if (oA_CarManage != null)
+ {
+ staff.Name = staff.Name + "(" + oA_CarManage.CarNumber + ")";
+ }
+ }
+ }
- this.selCarId.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, false, false).Where(x => x.SM_Post == "鍙告満");
+ this.selCarId.DataSource = staffs;
this.selCarId.DataTextField = "Name";
this.selCarId.DataValueField = "Keyid";
this.selCarId.DataBind();
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx.cs
index ab171a4..e05b037 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx.cs
@@ -60,7 +60,7 @@
this.selDriver.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
- this.selBuyerName.DataSource = bll_EC_OrderBasicBLL.GetOrderByPrintTypeId(37).Where(x => x.OrderState == 4 || x.OrderState == 2 || x.OrderState == 3).OrderBy(x => x.CreateTime);
+ this.selBuyerName.DataSource = bll_EC_OrderBasicBLL.GetOrderByPrintTypeId(37, CurrentUser.MemberId).Where(x => x.OrderState == 4 || x.OrderState == 2 || x.OrderState == 3 || x.OrderState == 1).OrderBy(x => x.CreateTime);
this.selBuyerName.DataTextField = "BuyerName";
this.selBuyerName.DataValueField = "Keyid";
this.selBuyerName.DataBind();
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx.cs
index c3fc7df..35bd5fb 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx.cs
@@ -60,7 +60,7 @@
this.selDriver.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
- this.selBuyerName.DataSource = bll_EC_OrderBasicBLL.GetOrderByPrintTypeId(37).Where(x => x.OrderState == 4 || x.OrderState == 2 || x.OrderState == 3).OrderBy(x => x.CreateTime);
+ this.selBuyerName.DataSource = bll_EC_OrderBasicBLL.GetOrderByPrintTypeId(37, CurrentUser.MemberId).Where(x => x.OrderState == 4 || x.OrderState == 2 || x.OrderState == 3 || x.OrderState == 1).OrderBy(x => x.CreateTime);
this.selBuyerName.DataTextField = "BuyerName";
this.selBuyerName.DataValueField = "Keyid";
this.selBuyerName.DataBind();
--
Gitblit v1.9.1