From c50c286df3108ce4a48674f15f29954fb3e4cb7f Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 22 十二月 2025 12:15:37 +0800
Subject: [PATCH] 送货计划增加“完成情况:全部、已送、未送”查询条件,默认“未送”
---
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx.cs
index 289ec45..ab171a4 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).OrderByDescending(x => x.CreateTime); ;
+ 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.DataTextField = "BuyerName";
this.selBuyerName.DataValueField = "Keyid";
this.selBuyerName.DataBind();
@@ -91,7 +91,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 +107,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> ";
@@ -206,7 +206,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