From 3007002f79b9f234274a07c2490d0105f322c8e8 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 24 三月 2026 11:58:56 +0800
Subject: [PATCH] 提交
---
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx.cs | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx.cs
index 35bd5fb..34f4c66 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx.cs
@@ -31,6 +31,7 @@
CoreCmsPlanOrderBLL bll_CoreCmsPlanOrderBLL = null;
CoreCmsPlanOrderItemBLL bll_CoreCmsPlanOrderItemBLL = null;
EC_OrderPrintParameterBLL _eC_OrderPrintParameterBLL = null;
+ OA_CarManageBll _OA_CarManageBll = null;
//鍒濆鍖�
public DeliverWorkBookLiShiAnPaiList()
@@ -45,6 +46,7 @@
CacheFactory.InitializeCacheFactory(new DefaultCacheStrategy());//鍒濆鍖栫紦瀛樺伐鍘�
CACHE = CacheFactory.GetCacher();//鍒涘缓缂撳瓨
CACHE.TimeOut = 6000;
+ _OA_CarManageBll = new OA_CarManageBll();
}
//椤甸潰鍔犺浇
@@ -53,7 +55,19 @@
// UCPager1.AspNetPager.PageChanged += AspNetPager1_PageChanged;
if (!IsPostBack)
{
- this.selDriver.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.selDriver.DataSource = staffs;
this.selDriver.DataTextField = "Name";
this.selDriver.DataValueField = "Keyid";
this.selDriver.DataBind();
@@ -126,7 +140,7 @@
var cmsPlanOrderItems = bll_CoreCmsPlanOrderItemBLL.GetModelsByZongOrderid(this.selBuyerName.Value.Trim().ToInt32().Value).Where(x => ids.Contains(x.orderId));
var coreDeliverOrderItems = bll_CoreCmsPlanOrderItemBLL.GetDeliverModelsByZongOrderid(this.selBuyerName.Value.Trim().ToInt32().Value).Where(x => ids.Contains(x.PlanOrderId));
-
+ var oA_CarManages = _OA_CarManageBll.SelectListByFirmIdnotstaff(CurrentUser.MemberId);
foreach (var coreDeliverOrder in coreDeliverOrders)
{
if (coreDeliverOrder.DriverId.HasValue)
@@ -135,6 +149,11 @@
if (oA_Staff != null)
{
coreDeliverOrder.DriverName = oA_Staff.Name;
+ var carManage = oA_CarManages.Where(x => x.StaffID == oA_Staff.Keyid).FirstOrDefault();
+ if (carManage != null)
+ {
+ coreDeliverOrder.DriverName += "(" + carManage.CarNumber + ")";
+ }
}
}
else
@@ -143,6 +162,11 @@
if (oA_Staff1 != null)
{
coreDeliverOrder.DriverName = oA_Staff1.Name;
+ var carManage = oA_CarManages.Where(x => x.StaffID == oA_Staff1.Keyid).FirstOrDefault();
+ if (carManage != null)
+ {
+ coreDeliverOrder.DriverName += "(" + carManage.CarNumber + ")";
+ }
}
else
{
--
Gitblit v1.9.1