From b03ae699c49cfca53d22772f0c2aec5210bc9758 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 02 四月 2026 08:50:35 +0800
Subject: [PATCH] 张薇按我这个界面比例画图 生产要求只填1行就够了，其他跟之前的一样 这个地方是增加或者删除不需要的后道
---
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx.cs | 40 ++++++++++++++++++++++++++++++++--------
1 files changed, 32 insertions(+), 8 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx.cs
index 2f067be..0603577 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx.cs
@@ -26,11 +26,12 @@
private static ICacheStrategy CACHE = null;//缂撳瓨鎺ュ彛瀵硅薄
public string biaotou = "";
public string biaowei = "";
-
+
CoreCmsPlanOrderBLL bll_CoreCmsPlanOrderBLL = null;
CoreCmsPlanOrderItemBLL bll_CoreCmsPlanOrderItemBLL = null;
EC_OrderPrintParameterBLL _eC_OrderPrintParameterBLL = null;
+ OA_CarManageBll _OA_CarManageBll = null;
//鍒濆鍖�
public DeliverWorkBookAnPaiList()
@@ -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.txtBeginDate.Value = DateTime.Now.AddDays(1).ToString("yyyy-MM-dd");
+ //this.txtBeginDate.Value = DateTime.Now.AddDays(1).ToString("yyyy-MM-dd");
var stringBuyerName = CACHE.RetrieveObject(CurrentUser.TrueMemberId + "BuyerName") as string;//浠庣紦瀛樹腑鑾峰彇鏁版嵁璁块棶瀹炵幇灞傜▼搴忛泦
if (null != stringBuyerName)
{
@@ -91,7 +105,7 @@
pa.PageSize = 500;
pa.PageIndex = 1;
- var coreDeliverOrders = _CoreDeliverOrderBLL.SelectModelPage(pa, CurrentUser.MemberId, this.selDriver.Value.ToInt32(),this.txtXuexiao.Value.Trim(),this.selBuyerName.Value.Trim(), this.txtBeginDate.Value.Trim(), this.txtEndDate.Value.Trim()); ;
+ var coreDeliverOrders = _CoreDeliverOrderBLL.SelectModelPage(pa, CurrentUser.MemberId, this.selDriver.Value.ToInt32(),this.txtXuexiao.Value.Trim(),this.selBuyerName.Value.Trim(), this.txtBeginDate.Value.Trim(), this.txtEndDate.Value.Trim(), this.selOrderState.Value); ;
EC_OrderPrintParameter _eC_OrderPrintParameter = _eC_OrderPrintParameterBLL.GetModel(this.selBuyerName.Value.Trim().ToInt32().Value);
InquiryCommonModel _inquiryCommonModel = null;
if (null == _eC_OrderPrintParameter)
@@ -107,7 +121,7 @@
if (string.IsNullOrEmpty(biaotou))
{
- string biaotou2 = "<th style=\"text-align:center\" > </th> <th style=\"text-align:center\" > </th><th style=\"text-align:center\" > </th> <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> <th style=\"text-align:center\" > </th>";
foreach (var inquiryWorkBookModel in inquiryWorkBookModels)
{
biaotou += " <th style=\"text-align:center\" > " + inquiryWorkBookModel.WorkBookSizeTxt + inquiryWorkBookModel.WorkBookNameTxt + " </th> ";
@@ -123,7 +137,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)
@@ -132,6 +146,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
@@ -140,6 +159,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
{
@@ -206,7 +230,7 @@
}
- 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> ";
+ 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> ";
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);
--
Gitblit v1.9.1