From 66a1290f368df2f5f543e14fe6abf8b31bf76490 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 18 十二月 2025 14:20:24 +0800
Subject: [PATCH] 提交
---
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx.cs | 39 +++++++++++++++++++++++++--------------
1 files changed, 25 insertions(+), 14 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..c3fc7df 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx.cs
@@ -60,12 +60,12 @@
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();
//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 +110,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> ";
}
@@ -162,28 +162,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 +202,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 +219,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 +232,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