From f6cb981322bc4c2a27921ad0480dce7fb483a4d8 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 10 四月 2026 13:23:54 +0800
Subject: [PATCH] 先提交一部分
---
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx.cs | 67 +++++++++++++++++++++++++--------
1 files changed, 51 insertions(+), 16 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx.cs
index 3234abb..ffb8010 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,19 +55,31 @@
// 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.BF_IsDriver);//.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();
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).OrderByDescending(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();
//this.selBuyerName.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
- this.txtEndDate.Value = DateTime.Now.ToString("yyyy-MM-dd");
+ //this.txtEndDate.Value = DateTime.Now.ToString("yyyy-MM-dd");
var stringBuyerName = CACHE.RetrieveObject(CurrentUser.TrueMemberId+ "BuyerName") as string;//浠庣紦瀛樹腑鑾峰彇鏁版嵁璁块棶瀹炵幇灞傜▼搴忛泦
if (null != stringBuyerName)
{
@@ -110,11 +124,11 @@
if (string.IsNullOrEmpty(biaotou))
{
- string biaotou2 = "<th style=\"text-align:center\" > </th> <th style=\"text-align:center\" > </th><th style=\"text-align:center\" > </th><th style=\"text-align:center\" > </th> <th style=\"text-align:center\" > </th> <th style=\"text-align:center\" > </th>";
+ string biaotou2 = "<th style=\"text-align:center\" > </th><th style=\"text-align:center\" > </th><th style=\"text-align:center\" > </th> <th style=\"text-align:center\" > </th> <th style=\"text-align:center\" > </th>";
foreach (var inquiryWorkBookModel in inquiryWorkBookModels)
{
- biaotou += " <th style=\"text-align:center\" colspan=\"2\"> " + inquiryWorkBookModel.WorkBookSizeTxt + inquiryWorkBookModel.WorkBookNameTxt + " </th> ";
- biaotou2 += " <th style=\"text-align:center\" > 宸查�� </th> <th style=\"text-align:center\" > 鏈�� </th> ";
+ biaotou += " <th style=\"text-align:center\" colspan=\"3\"> " + inquiryWorkBookModel.WorkBookSizeTxt + inquiryWorkBookModel.WorkBookNameTxt + " </th> ";
+ biaotou2 += " <th style=\"text-align:center\" > 宸查�� </th> <th style=\"text-align:center\" > 鏈�� </th><th style=\"text-align:center\" > 鑺傜害 </th> ";
}
@@ -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
{
@@ -162,28 +186,39 @@
var Number = coreDeliverOrderItems1.Sum(x => x.Number);
var LessNumber = coreDeliverOrderItems1.Sum(x => x.LessNumber);
+ var coreDeliverOrderItem2 = coreDeliverOrderItems1.Where(x => x.OrderID == coreDeliverOrder.id).FirstOrDefault();
+ var Numberbenci = 0;
+ var LessNumberbenci = 0;
+ if (coreDeliverOrderItem2 != null)
+ {
+ Numberbenci = coreDeliverOrderItem2.Number;
+ LessNumberbenci = coreDeliverOrderItem2.LessNumber;
+ }
+
+
+
if (cmsPlanOrderItem.nums > 0)
{
if (cmsPlanOrderItem.nums - LessNumber - Number > 0)
{
if (LessNumber + Number > 0)
{
- biaoge += " <td style=\"color: grey;text-align: center;\" > " + Number + " </td> <td style=\"text-align:center\"> <span style=\"color:#ff69b4;\" >" + (cmsPlanOrderItem.nums - LessNumber - Number) + " </span></td>";
+ biaoge += " <td style=\"color: grey;text-align: center;\" > " + Numberbenci + " </td> <td style=\"text-align:center\"> <span style=\"color:#ff69b4;\" >" + (cmsPlanOrderItem.nums - LessNumber - Number) + " </span></td><td style=\"color: grey;text-align: center;\" > " + LessNumberbenci + " </td> ";
}
else
{
- biaoge += " <td style=\"color: grey;text-align: center;\" > " + Number + " </td> <td style=\"text-align:center\"> <span style=\"color:red;\" >" + (cmsPlanOrderItem.nums - LessNumber - Number) + " </span></td>";
+ biaoge += " <td style=\"color: grey;text-align: center;\" > " + Numberbenci + " </td> <td style=\"text-align:center\"> <span style=\"color:red;\" >" + (cmsPlanOrderItem.nums - LessNumber - Number) + " </span></td><td style=\"color: grey;text-align: center;\" > " + LessNumberbenci + " </td>";
}
}
else
{
- biaoge += " <td style=\"color: grey;text-align: center;\" > " + Number + " </td> <td style=\"text-align:center\"> <span style=\"color:green;\" >" + (cmsPlanOrderItem.nums - LessNumber - Number) + " </span></td>";
+ biaoge += " <td style=\"color: grey;text-align: center;\" > " + Numberbenci + " </td> <td style=\"text-align:center\"> <span style=\"color:green;\" >" + (cmsPlanOrderItem.nums - LessNumber - Number) + " </span></td><td style=\"color: grey;text-align: center;\" > " + LessNumberbenci + " </td>";
}
}
else
{
- biaoge += " <td style=\"text-align:center\"> </td> <td style=\"text-align:center\"> <span style=\"color:green;\" ></span></td> ";
+ biaoge += " <td style=\"text-align:center\"> </td> <td style=\"text-align:center\"> <span style=\"color:green;\" ></span></td> <td style=\"text-align:center\"> <span style=\"color:green;\" ></span></td>";
}
@@ -191,7 +226,7 @@
}
else
{
- biaoge += " <td style=\"text-align:center\"> </td> <td style=\"text-align:center\"> <span style=\"color:green;\" ></span></td> ";
+ biaoge += " <td style=\"text-align:center\"> </td> <td style=\"text-align:center\"> <span style=\"color:green;\" ></span></td><td style=\"text-align:center\"> <span style=\"color:green;\" ></span></td> ";
}
@@ -208,7 +243,7 @@
}
- biaowei = "<td></td> <td></td> <td></td> <td style=\"text-align:center\"> </td> <td style=\"color: grey;text-align: center;\" > " + coreDeliverOrders.Count() + " </td><td style=\"text-align:center\"> </td> ";
+ biaowei = " <td></td> <td></td> <td style=\"text-align:center\"> </td> <td style=\"color: grey;text-align: center;\" > " + coreDeliverOrders.Count() + " </td><td style=\"text-align:center\"> </td> ";
foreach (var inquiryWorkBookModel in inquiryWorkBookModels)
{
var nums = cmsPlanOrderItems.Where(x => x.name == inquiryWorkBookModel.WorkBookNameTxt && x.specification == inquiryWorkBookModel.WorkBookSizeTxt && ids.Contains(x.orderId)).Sum(x => x.nums);
@@ -221,17 +256,17 @@
{
if (LessNumber + Number > 0)
{
- biaowei += " <td style=\"color: grey;text-align: center;\" > " + Number + " </td> <td style=\"text-align:center\"> <span style=\"color:#ff69b4;\" >" + (nums - LessNumber - Number) + " </span></td>";
+ biaowei += " <td style=\"color: grey;text-align: center;\" > " + Number + " </td> <td style=\"text-align:center\"> <span style=\"color:#ff69b4;\" >" + (nums - LessNumber - Number) + " </span></td><td style=\"color: grey;text-align: center;\" > " + LessNumber + " </td>";
}
else
{
- biaowei += " <td style=\"color: grey;text-align: center;\" > " + Number + " </td> <td style=\"text-align:center\"> <span style=\"color:red;\" >" + (nums - LessNumber - Number) + " </span></td>";
+ biaowei += " <td style=\"color: grey;text-align: center;\" > " + Number + " </td> <td style=\"text-align:center\"> <span style=\"color:red;\" >" + (nums - LessNumber - Number) + " </span></td><td style=\"color: grey;text-align: center;\" > " + LessNumber + " </td>";
}
}
else
{
- biaowei += " <td style=\"color: grey;text-align: center;\" > " + Number + " </td> <td style=\"text-align:center\"> <span style=\"color:green;\" >" + (nums - LessNumber - Number) + " </span></td>";
+ biaowei += " <td style=\"color: grey;text-align: center;\" > " + Number + " </td> <td style=\"text-align:center\"> <span style=\"color:green;\" >" + (nums - LessNumber - Number) + " </span></td><td style=\"color: grey;text-align: center;\" > " + LessNumber + " </td> ";
}
--
Gitblit v1.9.1