From d3205f4627ceb7af1344ce77715def28fee5545b Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 17 十二月 2025 08:56:19 +0800
Subject: [PATCH] 在“编号”和“片区”直接增加一列“送货时间”，该送货时间显示进行了“送货安排”操作的学校的时间，没有安排送货的学校就是空白 完成
---
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx.designer.cs | 17 -
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx | 38 +-
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx | 12
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs | 18 +
CY_ECommercePlatform/CY.IDAL/OA/ICoreCmsPlanOrderItemDAL.cs | 8
CY_ECommercePlatform/CY.BLL/OA/CoreDeliverOrderBLL.cs | 15
CY_ECommercePlatform/CY.Model/OA/CoreCmsPlanOrder.cs | 5
CY_ECommercePlatform/CY.SQLDAL/OA/CoreDeliverOrderDAL.cs | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiDetail.aspx.cs | 76 +++++-
CY_ECommercePlatform/CY.SQLDAL/OA/CoreCmsPlanOrderItemDAL.cs | 11
CY_ECommercePlatform/CY.BLL/OA/CoreCmsPlanOrderItemBLL.cs | 19 +
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx.cs | 172 +++++++++++++-
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx.designer.cs | 13
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiDetail.aspx | 25 +-
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiDetail.aspx.designer.cs | 9
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx | 38 +-
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiEdit.aspx.cs | 4
CY_ECommercePlatform/CY.Model/OA/CoreDeliverOrder.cs | 5
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx.cs | 174 +++++++++++++-
20 files changed, 520 insertions(+), 143 deletions(-)
diff --git a/CY_ECommercePlatform/CY.BLL/OA/CoreCmsPlanOrderItemBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/CoreCmsPlanOrderItemBLL.cs
index 25f9bfe..467c9d9 100644
--- a/CY_ECommercePlatform/CY.BLL/OA/CoreCmsPlanOrderItemBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/OA/CoreCmsPlanOrderItemBLL.cs
@@ -99,7 +99,7 @@
/// <summary>
- /// 鑾峰彇鍏ㄩ儴鍚堜綔瀹㈡埛
+ /// 鑾峰彇鎵�鏈夌殑閫佽揣鏄庣粏锛岀姸鎬�2
/// </summary>
/// <param name="orderkeyid">涓婚敭id</param>
/// <returns></returns>
@@ -110,8 +110,11 @@
}
+
+
+
/// <summary>
- /// 鑾峰彇鍏ㄩ儴鍚堜綔瀹㈡埛
+ /// 鑾峰彇鎵�鏈夌殑閫佽揣鏄庣粏锛岀姸鎬�0锛�1
/// </summary>
/// <param name="orderkeyid">涓婚敭id</param>
/// <returns></returns>
@@ -123,6 +126,18 @@
/// <summary>
+ /// 鑾峰彇鎵�鏈夌殑閫佽揣鏄庣粏锛岀姸鎬�0锛�1锛�2
+ /// </summary>
+ /// <param name="orderkeyid">涓婚敭id</param>
+ /// <returns></returns>
+ public IEnumerable<CoreDeliverOrderItem> GetDeliverModelsByplanOrderids(int orderkeyid)
+ {
+ Query query = new Query();
+ return _ICoreCmsPlanOrderItemDAL.GetDeliverModelsByplanOrderids(orderkeyid);
+ }
+
+
+ /// <summary>
/// 鑾峰彇鍏ㄩ儴鍚堜綔瀹㈡埛
/// </summary>
/// <param name="Keyid">涓婚敭id</param>
diff --git a/CY_ECommercePlatform/CY.BLL/OA/CoreDeliverOrderBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/CoreDeliverOrderBLL.cs
index d93cda7..b4b4236 100644
--- a/CY_ECommercePlatform/CY.BLL/OA/CoreDeliverOrderBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/OA/CoreDeliverOrderBLL.cs
@@ -177,7 +177,7 @@
Condition += " and b.shipAddress = '" + shipAddress + "'";
if (!string.IsNullOrEmpty(BuyerName))
- Condition += " and c.BuyerName like '%" + BuyerName + "%'";
+ Condition += " and c.Keyid = '" + BuyerName + "'";
if (!string.IsNullOrEmpty(createTimeStart))
@@ -193,7 +193,7 @@
{
new Criterion("", Condition),
- new Criterion("orderBy"," MakeTime desc ")
+ new Criterion("orderBy"," MakeTime ")
};
query.Criteria = criterias;
return _ICoreDeliverOrderDAL.SelectModelPage(query, pa);
@@ -213,7 +213,14 @@
if (!string.IsNullOrEmpty(OrderState))
{
- Condition += " and a.OrderState = " + OrderState + " ";
+ if (OrderState != "4")
+ {
+ Condition += " and a.OrderState = " + OrderState + " ";
+ }
+ else
+ {
+ Condition += " and a.OrderState in( 0,1 ) ";
+ }
}
else
{
@@ -238,7 +245,7 @@
Condition += " and b.shipAddress = '" + shipAddress + "'";
if (!string.IsNullOrEmpty(BuyerName))
- Condition += " and c.BuyerName like '%" + BuyerName + "%'";
+ Condition += " and c.Keyid = '" + BuyerName + "'";
if (!string.IsNullOrEmpty(createTimeStart))
diff --git a/CY_ECommercePlatform/CY.IDAL/OA/ICoreCmsPlanOrderItemDAL.cs b/CY_ECommercePlatform/CY.IDAL/OA/ICoreCmsPlanOrderItemDAL.cs
index 3712199..9586c36 100644
--- a/CY_ECommercePlatform/CY.IDAL/OA/ICoreCmsPlanOrderItemDAL.cs
+++ b/CY_ECommercePlatform/CY.IDAL/OA/ICoreCmsPlanOrderItemDAL.cs
@@ -49,5 +49,13 @@
/// <returns></returns>
IEnumerable<CoreDeliverOrderItem> GetDeliverModelsByplanOrderid(int planorderkeyid);
+
+ /// <summary>
+ /// 鏍规嵁鎬籵rderid鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="orderkeyid">缂栧彿</param>
+ /// <returns></returns>
+ IEnumerable<CoreDeliverOrderItem> GetDeliverModelsByplanOrderids(int orderkeyid);
+
}
}
diff --git a/CY_ECommercePlatform/CY.Model/OA/CoreCmsPlanOrder.cs b/CY_ECommercePlatform/CY.Model/OA/CoreCmsPlanOrder.cs
index e6f6550..34388f4 100644
--- a/CY_ECommercePlatform/CY.Model/OA/CoreCmsPlanOrder.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/CoreCmsPlanOrder.cs
@@ -203,7 +203,10 @@
public System.Decimal keYongAmounts { get; set; }
-
+ /// <summary>
+ /// 寤虹珛鏃堕棿
+ /// </summary>
+ public string MakeTime { get; set; }
/// <summary>
/// 寤虹珛鏃堕棿
/// </summary>
diff --git a/CY_ECommercePlatform/CY.Model/OA/CoreDeliverOrder.cs b/CY_ECommercePlatform/CY.Model/OA/CoreDeliverOrder.cs
index a661fd1..2f37124 100644
--- a/CY_ECommercePlatform/CY.Model/OA/CoreDeliverOrder.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/CoreDeliverOrder.cs
@@ -54,6 +54,11 @@
public System.String shipAddress { get; set; }
public System.String DriverName { get; set; }
+ /// <summary>
+ /// 琛ㄦ牸string
+ /// </summary>
+ public string biaoge { get; set; }
+
public System.String BuyerName { get; set; }
public int OrderState { get; set; }
diff --git a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
index 257421a..ac0b495 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
@@ -1539,7 +1539,7 @@
public IEnumerable<EC_OrderBasic> GetOrderByPrintTypeId(int PrintTypeId)
{
- IList<EC_OrderBasic> result = _dataBase.SelectModel<EC_OrderBasic>(" * ", "EC_OrderBasic ", string.Format(" PrintTypeId = {0} and OrderState = 4 ", PrintTypeId));
+ IList<EC_OrderBasic> result = _dataBase.SelectModel<EC_OrderBasic>(" * ", "EC_OrderBasic ", string.Format(" PrintTypeId = {0} and (OrderState = 4 or OrderState = 2 or OrderState = 3 )", PrintTypeId));
return result;
}
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/CoreCmsPlanOrderItemDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/CoreCmsPlanOrderItemDAL.cs
index 2b1fb4f..a1ca3f6 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/CoreCmsPlanOrderItemDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/CoreCmsPlanOrderItemDAL.cs
@@ -208,6 +208,17 @@
/// <summary>
+ /// 鍏ㄩ儴鏌ヨ
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.CoreDeliverOrderItem> GetDeliverModelsByplanOrderids(int orderkeyid)
+ {
+ return _dataBase.SelectModel<Model.CoreDeliverOrderItem>(" a.*,b.[OrderId] as PlanOrderId,b.[MakeTime],b.[OrderState] ", " [CoreDeliverOrderItem] a Inner Join [CoreDeliverOrder] as b On(a.[OrderID]=b.[id] ) Inner Join [CoreCmsPlanOrder] as c On(b.[OrderID]=c.[id] ) ", " c.[orderkeyid] = " + orderkeyid + " and b.[OrderState] in (0,1,2) ") as IList<Model.CoreDeliverOrderItem>;//鎵ц鏌ヨ
+ }
+
+
+ /// <summary>
/// 鍒嗛〉鏌ヨ
/// </summary>
/// <param name="query"></param>
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/CoreDeliverOrderDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/CoreDeliverOrderDAL.cs
index aeb309a..688fe68 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/CoreDeliverOrderDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/CoreDeliverOrderDAL.cs
@@ -28,7 +28,7 @@
/// <summary>
/// 鍒嗛〉榛樿鎺掑簭瀛楁
/// </summary>
- const string ORDERBY = " MakeTime desc ";
+ const string ORDERBY = " MakeTime";
#endregion
public CoreDeliverOrderDAL()
{
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiDetail.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiDetail.aspx
index 3460bc1..00be255 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiDetail.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiDetail.aspx
@@ -174,11 +174,10 @@
</div>
<div>
- <asp:Repeater ID="RepClientList" runat="server">
- <HeaderTemplate>
+
<table class="tableStyle">
<tr>
- <th style="text-align: center">
+ <th style="text-align: center">
鍝佺
</th>
<th style="text-align: center">
@@ -188,20 +187,21 @@
<th style="text-align: center">
鏈�佹暟閲�
</th>
+ <%=biaotou %>
+ <%--
<th style="text-align: center">
鏈閫佽揣鏁伴噺
</th>
<th style="text-align: center">
鏈鑺傜害鏁伴噺
- </th>
+ </th>--%>
</tr>
- </HeaderTemplate>
- <ItemTemplate>
+
<tr>
-
- <td style="text-align: center" >
+ <%=biaowei %>
+ <%-- <td style="text-align: center" >
<%#Eval("ZYBSpecification")%> <%#Eval("ZYBName")%>
</td>
<td style="text-align: center" >
@@ -215,15 +215,14 @@
</td>
<td style="text-align: center" >
<%#Eval("LessNumber")%>
- </td>
+ </td>--%>
</tr>
- </ItemTemplate>
- <FooterTemplate>
+
+
</table>
- </FooterTemplate>
- </asp:Repeater>
+
</div>
</div>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiDetail.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiDetail.aspx.cs
index 95b8278..50ce60d 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiDetail.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiDetail.aspx.cs
@@ -24,7 +24,8 @@
OA_CarManageBll _OA_CarManageBll = null;
CoreDeliverOrderBLL _CoreDeliverOrderBLL = null;
CoreDeliverOrderItemBLL _CoreDeliverOrderItemBLL = null;
-
+ public string biaotou = "";
+ public string biaowei = "";
//鍒濆鍖�
@@ -65,17 +66,17 @@
//宸茬粡閫佽揣鏁伴噺
- var coreDeliverOrderItemssonghuo = _CoreCmsPlanOrderItemBLL.GetDeliverModelsByZongOrderid(coreCmsPlanOrder.orderkeyid.Value).Where(x=>x.PlanOrderId == coreCmsPlanOrder.id );
-
-
+ var coreDeliverOrderItemssssss = _CoreCmsPlanOrderItemBLL.GetDeliverModelsByplanOrderids(coreCmsPlanOrder.orderkeyid.Value).Where(x=>x.PlanOrderId == coreCmsPlanOrder.id ).OrderByDescending(x=>x.MakeTime);
-
-
-
-
+
+ var coreDeliverOrderItemssonghuo = coreDeliverOrderItemssssss.Where(x => x.OrderState == 2);
+
+
+
+
//閫佽揣鏁伴噺缁熻
var coreDeliverOrderItemsgroup = coreDeliverOrderItemssonghuo.GroupBy(p => new { p.ZYBName, p.ZYBSpecification }) // 澶氫釜瀛楁浣滀负鍖垮悕绫诲瀷鍒嗙粍閿�
@@ -103,6 +104,41 @@
+
+ //閫佽揣鏁伴噺缁熻
+ var coreDeliverOrderItemssssssgroup = coreDeliverOrderItemssssss.GroupBy(p => new {p.MakeTime }) // 澶氫釜瀛楁浣滀负鍖垮悕绫诲瀷鍒嗙粍閿�
+ .Select(g => new CoreDeliverOrderItem
+ {
+ // 鍒嗙粍瀛楁
+ MakeTime = g.Key.MakeTime
+ }).OrderByDescending(x=>x.MakeTime).ToList();
+ string biaotou2 = "";
+ foreach (var coreDeliverOrderItem1 in coreDeliverOrderItemssssssgroup)
+ {
+ biaotou += "<th style=\"text-align:center\" > "+ coreDeliverOrderItem1.MakeTime.Value.ToString("yyyy-MM-dd") + " </th>";
+ biaotou2 += "<th style=\"text-align:center\" > 鑺傜害锛�" + coreDeliverOrderItem1.MakeTime.Value.ToString("MM鏈坉d鏃�") + " 锛�</th>";
+ }
+
+ biaotou += biaotou2;
+
+
+ //閫佽揣鏁伴噺缁熻
+ var coreDeliverOrderItemssssssgroupxiangxi = coreDeliverOrderItemssssss.GroupBy(p => new { p.MakeTime, p.ZYBName, p.ZYBSpecification }) // 澶氫釜瀛楁浣滀负鍖垮悕绫诲瀷鍒嗙粍閿�
+ .Select(g => new CoreDeliverOrderItem
+ {
+ // 鍒嗙粍瀛楁
+ MakeTime = g.Key.MakeTime,
+ // 鍒嗙粍瀛楁
+ ZYBName = g.Key.ZYBName,
+ ZYBSpecification = g.Key.ZYBSpecification,
+ // 缁熻缁撴灉
+ //Count = g.Count(), // 姣忕粍浜烘暟
+ //AverageSalary = g.Average(p => p.Salary), // 骞冲潎宸ヨ祫
+ Number = g.Sum(p => p.Number), // 宸ヨ祫鎬诲拰
+ LessNumber = g.Sum(p => p.LessNumber)
+ }).OrderByDescending(x => x.MakeTime).ToList();
+
+
foreach (var coreDeliverOrderItem in coreDeliverOrderItems)
{
var deliverOrderItem = coreDeliverOrderItemsgroup.Where(x => x.ZYBName == coreDeliverOrderItem.ZYBName && x.ZYBSpecification == coreDeliverOrderItem.ZYBSpecification).FirstOrDefault();
@@ -122,17 +158,33 @@
}
}
-
+ biaowei += "<tr>";
-
+ biaowei += " <td style=\"text-align: center;\" > " + coreDeliverOrderItem.ZYBSpecification + coreDeliverOrderItem.ZYBName + " </td> ";
+ biaowei += " <td style=\"text-align: center;\" > " + coreDeliverOrderItem.DingdanNumber + " </td> ";
+ biaowei += " <td style=\"text-align: center;\" > " + coreDeliverOrderItem.WeisongNumber + " </td> ";
+
+ string biaowei2 = "";
+ foreach (var coreDeliverOrderItem1 in coreDeliverOrderItemssssssgroup)
+ {
+
+ var deliverOrderItemaaaaaaaa = coreDeliverOrderItemssssssgroupxiangxi.Where(x => x.ZYBName == coreDeliverOrderItem.ZYBName && x.ZYBSpecification == coreDeliverOrderItem.ZYBSpecification && x.MakeTime == coreDeliverOrderItem1.MakeTime).FirstOrDefault();
+
+ biaowei += " <td style=\"text-align: center;\" > " + deliverOrderItemaaaaaaaa.Number + " </td> ";
+ biaowei2 += " <td style=\"text-align: center;\" > " + deliverOrderItemaaaaaaaa.LessNumber + " </td> ";
+ }
+
+ biaowei += biaowei2;
+
+ biaowei += "</tr>";
+
}
- this.RepClientList.DataSource = coreDeliverOrderItems;
- this.RepClientList.DataBind();
+
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiDetail.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiDetail.aspx.designer.cs
index 319977c..8a2c755 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiDetail.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiDetail.aspx.designer.cs
@@ -103,14 +103,5 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanZhuangtai;
-
- /// <summary>
- /// RepClientList 鎺т欢銆�
- /// </summary>
- /// <remarks>
- /// 鑷姩鐢熸垚鐨勫瓧娈点��
- /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
- /// </remarks>
- protected global::System.Web.UI.WebControls.Repeater RepClientList;
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiEdit.aspx.cs
index 824177e..25b5869 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiEdit.aspx.cs
@@ -157,7 +157,7 @@
if (SaveOrder())
{
//鎿嶄綔鎴愬姛
- JavaScript.MessageBox("鎿嶄綔鎴愬姛", this,true,true);
+ JavaScript.MessageBoxsssss("鎿嶄綔鎴愬姛", this,true,true);
}
else
{
@@ -201,7 +201,7 @@
var sss = _CoreDeliverOrderBLL.UpdateModel(coreDeliverOrder);
//鎿嶄綔鎴愬姛
- JavaScript.MessageBox("鎾ら攢鎴愬姛", this, true, true);
+ JavaScript.MessageBoxsssss("鎾ら攢鎴愬姛", this, true, true);
return;
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx
index 0e670d1..c34fb1f 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx
@@ -30,7 +30,7 @@
//鏌ョ湅鏄庣粏
function onViewCarInsurance(keyid) {
- top.Dialog.open({ URL: "/Pages/business/DeliverWorkBookAnPaiDetail.aspx?orderId=" + keyid, Title: "鏌ョ湅鏄庣粏", Width: 900, Height: 900 });
+ top.Dialog.open({ URL: "/Pages/business/DeliverWorkBookAnPaiDetail.aspx?orderId=" + keyid, Title: "鏌ョ湅鏄庣粏", Width: 1500, Height: 900 });
}
//淇濋櫓
function onViewfahuo(keyid) {
@@ -105,10 +105,9 @@
瀹㈡埛鍚嶇О锛�
</td>
<td>
- <input id='txtBuyerName' runat="server" maxlength='100' list="browsers" />
- <datalist id="browsers">
- <%=xiala %>
- </datalist>
+
+ <select keepdefaultstyle='true' id='selBuyerName' runat="server" >
+ </select>
</td>
<td class="ali03">
閫佽揣鏃堕棿锛�
@@ -134,7 +133,7 @@
<td >
- <asp:Button ID="btn_Submit" Text="鏌ヨ" runat="server" OnClick="btn_Search_Click" /> <input type="button" value='閲嶇疆' onclick='document.body.innerHTML="";window.location=window.location;' />
+ <asp:Button ID="btn_Search" Text="鏌ヨ" runat="server" OnClick="btn_Search_Click" /> <input type="button" value='閲嶇疆' onclick='document.body.innerHTML="";window.location=window.location;' />
</td>
</tr>
</table>
@@ -151,9 +150,9 @@
<th style="text-align: center">
鏃ユ湡
</th>
- <th style="text-align: center">
+ <%-- <th style="text-align: center">
瀹㈡埛鍚嶇О
- </th>
+ </th>--%>
<th style="text-align: center">
鐗囧尯
</th>
@@ -163,27 +162,27 @@
<th style="text-align: center">
鍙告満
</th>
-
+ <%=biaotou %>
- <th style="text-align: center">
+ <%-- <th style="text-align: center">
鎿嶄綔
- </th>
+ </th>--%>
</tr>
</HeaderTemplate>
<ItemTemplate>
<tr>
<td style="text-align: center">
- <%#Container.ItemIndex + 1+ this.UCPager1.PageSize * (this.UCPager1.PageIndex - 1)%>
+ <%#Container.ItemIndex + 1 %>
</td>
- <td style="text-align: center">
+ <td style="text-align: center;white-space: nowrap;">
<%#Eval("MakeTime", "{0:yyyy-MM-dd HH:mm}")%>
</td>
- <td style="text-align: center">
+ <%-- <td style="text-align: center">
<%#Eval("BuyerName")%>
- </td>
+ </td>--%>
<td style="text-align: center">
<%#Eval("pianqu")%>
</td>
@@ -194,7 +193,7 @@
<td style="text-align: center">
<%#Eval("DriverName")%>
</td>
-
+ <%#Eval("biaoge")%>
<td class="Operate " style="text-align: center">
<span onclick="onViewCarInsurance('<%#Eval("id")%>')">鏌ョ湅鏄庣粏</span>
<span menu_member_case_id="case_onEdit" menu_member_case_name="淇敼" onclick="onEdit('<%#Eval("id")%>')">淇敼</span>
@@ -206,12 +205,13 @@
</tr>
</ItemTemplate>
<FooterTemplate>
+ <tr>
+ <%=biaowei %>
+ </tr>
</table>
</FooterTemplate>
</asp:Repeater>
- <div id="page">
- <uc:UCPager ID="UCPager1" runat="server" />
- </div>
+
</div>
</div>
</form>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx.cs
index f1d734c..2f067be 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx.cs
@@ -11,6 +11,7 @@
using CY.Infrastructure.Common;
using CY.BLL.EC;
using CY.Model.Inquiry;
+using CY.Infrastructure.Cache;
namespace CY.WebForm.Pages.business
{
@@ -22,6 +23,14 @@
OA_StaffBLL bll_OA_StaffBLL = null;
EC_OrderBasicBLL bll_EC_OrderBasicBLL = null;
public string xiala = "";
+ private static ICacheStrategy CACHE = null;//缂撳瓨鎺ュ彛瀵硅薄
+ public string biaotou = "";
+ public string biaowei = "";
+
+
+ CoreCmsPlanOrderBLL bll_CoreCmsPlanOrderBLL = null;
+ CoreCmsPlanOrderItemBLL bll_CoreCmsPlanOrderItemBLL = null;
+ EC_OrderPrintParameterBLL _eC_OrderPrintParameterBLL = null;
//鍒濆鍖�
public DeliverWorkBookAnPaiList()
@@ -30,12 +39,18 @@
bll_OA_StaffBLL = new OA_StaffBLL();
_CoreDeliverOrderBLL = new CoreDeliverOrderBLL();
bll_EC_OrderBasicBLL = new EC_OrderBasicBLL();
+ bll_CoreCmsPlanOrderBLL = new CoreCmsPlanOrderBLL();
+ bll_CoreCmsPlanOrderItemBLL = new CoreCmsPlanOrderItemBLL();
+ _eC_OrderPrintParameterBLL = new EC_OrderPrintParameterBLL();
+ CacheFactory.InitializeCacheFactory(new DefaultCacheStrategy());//鍒濆鍖栫紦瀛樺伐鍘�
+ CACHE = CacheFactory.GetCacher();//鍒涘缓缂撳瓨
+ CACHE.TimeOut = 6000;
}
//椤甸潰鍔犺浇
protected void Page_Load(object sender, EventArgs e)
{
- UCPager1.AspNetPager.PageChanged += AspNetPager1_PageChanged;
+ //UCPager1.AspNetPager.PageChanged += AspNetPager1_PageChanged;
if (!IsPostBack)
{
this.selDriver.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, false, false).Where(x => x.SM_Post == "鍙告満"); ;
@@ -45,9 +60,17 @@
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.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");
+ var stringBuyerName = CACHE.RetrieveObject(CurrentUser.TrueMemberId + "BuyerName") as string;//浠庣紦瀛樹腑鑾峰彇鏁版嵁璁块棶瀹炵幇灞傜▼搴忛泦
+ if (null != stringBuyerName)
+ {
+ this.selBuyerName.Value = stringBuyerName;
+ }
BindList();
}
@@ -56,18 +79,51 @@
//缁戝畾鏁版嵁
private void BindList()
{
- var eC_OrderBasics = bll_EC_OrderBasicBLL.GetOrderByPrintTypeId(37).Where(x => x.OrderState == 4);
- foreach (var eC_OrderBasic in eC_OrderBasics)
- {
- xiala += "<option value=\"" + eC_OrderBasic.BuyerName + "\">";
+ //var eC_OrderBasics = bll_EC_OrderBasicBLL.GetOrderByPrintTypeId(37).Where(x => x.OrderState == 4);
+ //foreach (var eC_OrderBasic in eC_OrderBasics)
+ //{
+ // xiala += "<option value=\"" + eC_OrderBasic.BuyerName + "\">";
+
+ //}
+ CACHE.AddObject(CurrentUser.TrueMemberId + "BuyerName", this.selBuyerName.Value.Trim());//灏嗙▼搴忛泦鍐欏叆缂撳瓨
+ Pagination pa = new Pagination();
+ 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()); ;
+ EC_OrderPrintParameter _eC_OrderPrintParameter = _eC_OrderPrintParameterBLL.GetModel(this.selBuyerName.Value.Trim().ToInt32().Value);
+ InquiryCommonModel _inquiryCommonModel = null;
+ if (null == _eC_OrderPrintParameter)
+ {
+ _inquiryCommonModel = new InquiryCommonModel();
+ }
+ else
+ {
+ _inquiryCommonModel = SerializationHelper.DeSerialize(typeof(InquiryCommonModel), _eC_OrderPrintParameter.PrintParameter) as InquiryCommonModel;
}
- Pagination pa = new Pagination();
- pa.PageSize = UCPager1.AspNetPager.PageSize;
- pa.PageIndex = UCPager1.AspNetPager.CurrentPageIndex;
+ var inquiryWorkBookModels = _inquiryCommonModel.InquiryWorkBookList.OrderBy(x => x.WorkBookSizeTxt).ThenBy(x => x.WorkBookNameTxt);
- var coreDeliverOrders = _CoreDeliverOrderBLL.SelectModelPage(pa, CurrentUser.MemberId, this.selDriver.Value.ToInt32(),this.txtXuexiao.Value.Trim(),this.txtBuyerName.Value.Trim(), this.txtBeginDate.Value.Trim(), this.txtEndDate.Value.Trim()); ;
+ 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>";
+ foreach (var inquiryWorkBookModel in inquiryWorkBookModels)
+ {
+ biaotou += " <th style=\"text-align:center\" > " + inquiryWorkBookModel.WorkBookSizeTxt + inquiryWorkBookModel.WorkBookNameTxt + " </th> ";
+ biaotou2 += " <th style=\"text-align:center\" > 鏈�� </th> ";
+
+
+ }
+ biaotou += "<th style=\"text-align:center\" > 鎿嶄綔</th></tr><tr>" + biaotou2+ "<th style=\"text-align:center\" > </th>";
+ }
+ var ids = coreDeliverOrders.Select(x => x.OrderId).ToArray();
+
+ var coreCmsPlanOrders = bll_CoreCmsPlanOrderBLL.GetModelByorderid(this.selBuyerName.Value.Trim().ToInt32().Value).Where(x=> ids.Contains(x.id));
+ 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));
+
+
foreach (var coreDeliverOrder in coreDeliverOrders)
{
if (coreDeliverOrder.DriverId.HasValue)
@@ -90,12 +146,100 @@
coreDeliverOrder.DriverName = coreDeliverOrder.DeliveryMoble;
}
}
-
+
+
+ var cmsPlanOrderItems1 = cmsPlanOrderItems.Where(x => x.orderId == coreDeliverOrder.OrderId);
+ foreach (var inquiryWorkBookModel in inquiryWorkBookModels)
+ {
+ string biaoge = "";
+ var cmsPlanOrderItem = cmsPlanOrderItems1.Where(x => x.name == inquiryWorkBookModel.WorkBookNameTxt && x.specification == inquiryWorkBookModel.WorkBookSizeTxt).FirstOrDefault();
+ if (cmsPlanOrderItem != null)
+ {
+ var coreDeliverOrderItems1 = coreDeliverOrderItems.Where(x => x.PlanOrderId == coreDeliverOrder.OrderId && x.ZYBName == inquiryWorkBookModel.WorkBookNameTxt && x.ZYBSpecification == inquiryWorkBookModel.WorkBookSizeTxt);
+
+ var Number = coreDeliverOrderItems1.Sum(x => x.Number);
+ var LessNumber = coreDeliverOrderItems1.Sum(x => x.LessNumber);
+
+ if (cmsPlanOrderItem.nums > 0)
+ {
+ if (cmsPlanOrderItem.nums - LessNumber - Number > 0)
+ {
+ if (LessNumber + Number > 0)
+ {
+ biaoge += " <td style=\"text-align:center\"> <span style=\"color:#ff69b4;\" >" + (cmsPlanOrderItem.nums - LessNumber - Number) + " </span></td>";
+ }
+ else
+ {
+ biaoge += " <td style=\"text-align:center\"> <span style=\"color:red;\" >" + (cmsPlanOrderItem.nums - LessNumber - Number) + " </span></td>";
+ }
+
+ }
+ else
+ {
+ biaoge += " <td style=\"text-align:center\"> <span style=\"color:green;\" >" + (cmsPlanOrderItem.nums - LessNumber - Number) + " </span></td>";
+ }
+ }
+ else
+ {
+ biaoge += " <td style=\"text-align:center\"> <span style=\"color:green;\" ></span></td> ";
+ }
+
+
+
+ }
+ else
+ {
+ biaoge += " <td style=\"text-align:center\"> </td> <td style=\"text-align:center\"> <span style=\"color:green;\" ></span></td> ";
+ }
+
+
+
+ coreDeliverOrder.biaoge += biaoge;
+
+
+
+
+ }
+
+
+
}
+
+
+ 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);
+
+ var coreDeliverOrderItems1 = coreDeliverOrderItems.Where(x => x.ZYBName == inquiryWorkBookModel.WorkBookNameTxt && x.ZYBSpecification == inquiryWorkBookModel.WorkBookSizeTxt && ids.Contains(x.PlanOrderId));
+
+ var Number = coreDeliverOrderItems1.Sum(x => x.Number);
+ var LessNumber = coreDeliverOrderItems1.Sum(x => x.LessNumber);
+ if ((nums - LessNumber - Number) > 0)
+ {
+ if (LessNumber + Number > 0)
+ {
+ biaowei += " <td style=\"text-align:center\"> <span style=\"color:#ff69b4;\" >" + (nums - LessNumber - Number) + " </span></td>";
+ }
+ else
+ {
+ biaowei += " <td style=\"text-align:center\"> <span style=\"color:red;\" >" + (nums - LessNumber - Number) + " </span></td>";
+ }
+
+ }
+ else
+ {
+ biaowei += " <td style=\"text-align:center\"> <span style=\"color:green;\" >" + (nums - LessNumber - Number) + " </span></td>";
+ }
+
+
+
+ }
+ biaowei += " <td></td>";
this.RepClientList.DataSource = coreDeliverOrders;
this.RepClientList.DataBind();
- UCPager1.AspNetPager.RecordCount = pa.RecordCount;
+ //UCPager1.AspNetPager.RecordCount = pa.RecordCount;
}
//鍒嗛〉浜嬩欢
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx.designer.cs
index 43854ed..dd9f6e5 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx.designer.cs
@@ -42,13 +42,13 @@
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
- /// txtBuyerName 鎺т欢銆�
+ /// selBuyerName 鎺т欢銆�
/// </summary>
/// <remarks>
/// 鑷姩鐢熸垚鐨勫瓧娈点��
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
- protected global::System.Web.UI.HtmlControls.HtmlInputText txtBuyerName;
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selBuyerName;
/// <summary>
/// txtBeginDate 鎺т欢銆�
@@ -87,13 +87,13 @@
protected global::System.Web.UI.HtmlControls.HtmlInputText txtXuexiao;
/// <summary>
- /// btn_Submit 鎺т欢銆�
+ /// btn_Search 鎺т欢銆�
/// </summary>
/// <remarks>
/// 鑷姩鐢熸垚鐨勫瓧娈点��
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
- protected global::System.Web.UI.WebControls.Button btn_Submit;
+ protected global::System.Web.UI.WebControls.Button btn_Search;
/// <summary>
/// RepClientList 鎺т欢銆�
@@ -103,14 +103,5 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.Repeater RepClientList;
-
- /// <summary>
- /// UCPager1 鎺т欢銆�
- /// </summary>
- /// <remarks>
- /// 鑷姩鐢熸垚鐨勫瓧娈点��
- /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
- /// </remarks>
- protected global::CY.WebForm.Pages.common.UCPager UCPager1;
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx
index 5ddfbe8..3a559b8 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx
@@ -30,7 +30,7 @@
//鏌ョ湅鏄庣粏
function onViewCarInsurance(keyid) {
- top.Dialog.open({ URL: "/Pages/business/DeliverWorkBookAnPaiDetail.aspx?orderId=" + keyid, Title: "鏌ョ湅鏄庣粏", Width: 900, Height: 900 });
+ top.Dialog.open({ URL: "/Pages/business/DeliverWorkBookAnPaiDetail.aspx?orderId=" + keyid, Title: "鏌ョ湅鏄庣粏", Width: 1500, Height: 900 });
}
//淇濋櫓
function onViewfahuo(keyid) {
@@ -107,10 +107,8 @@
</td>
<td>
- <input id='txtBuyerName' runat="server" maxlength='100' list="browsers" />
- <datalist id="browsers">
- <%=xiala %>
- </datalist>
+ <select keepdefaultstyle='true' id='selBuyerName' runat="server" >
+ </select>
@@ -143,6 +141,7 @@
<td>
<select keepdefaultstyle='true' id='selOrderState' runat="server" >
<option value="">璇烽�夋嫨</option>
+ <option value="4" selected="selected" >鏈畬鎴�</option>
<option value="0">鏈��</option>
<option value="1">閰嶉�佷腑</option>
<option value="2">宸查��</option>
@@ -164,12 +163,12 @@
<th width="30" style="text-align: center">
缂栧彿
</th>
- <th style="text-align: center">
+ <th style="text-align: center;">
鏃ユ湡
</th>
- <th style="text-align: center">
+ <%-- <th style="text-align: center">
瀹㈡埛鍚嶇О
- </th>
+ </th>--%>
<th style="text-align: center">
鐗囧尯
</th>
@@ -182,26 +181,26 @@
<th style="text-align: center">
閫佽揣鐘舵��
</th>
-
+ <%=biaotou %>
- <th style="text-align: center">
+ <%-- <th style="text-align: center">
鎿嶄綔
- </th>
+ </th>--%>
</tr>
</HeaderTemplate>
<ItemTemplate>
<tr>
<td style="text-align: center">
- <%#Container.ItemIndex + 1+ this.UCPager1.PageSize * (this.UCPager1.PageIndex - 1)%>
+ <%#Container.ItemIndex + 1 %>
</td>
- <td style="text-align: center">
+ <td style="text-align: center;white-space: nowrap;">
<%#Eval("MakeTime", "{0:yyyy-MM-dd HH:mm}")%>
</td>
- <td style="text-align: center">
+ <%-- <td style="text-align: center">
<%#Eval("BuyerName")%>
- </td>
+ </td>--%>
<td style="text-align: center">
<%#Eval("pianqu")%>
</td>
@@ -215,7 +214,7 @@
<td style="text-align: center">
<%#Eval("OrderStateName")%>
</td>
-
+ <%#Eval("biaoge")%>
<td class="Operate " style="text-align: center">
<span onclick="onViewCarInsurance('<%#Eval("id")%>')">鏌ョ湅鏄庣粏</span>
@@ -226,12 +225,13 @@
</tr>
</ItemTemplate>
<FooterTemplate>
+ <tr>
+ <%=biaowei %>
+ </tr>
</table>
</FooterTemplate>
</asp:Repeater>
- <div id="page">
- <uc:UCPager ID="UCPager1" runat="server" />
- </div>
+
</div>
</div>
</form>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx.cs
index 828a983..3234abb 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx.cs
@@ -11,6 +11,7 @@
using CY.Infrastructure.Common;
using CY.BLL.EC;
using CY.Model.Inquiry;
+using CY.Infrastructure.Cache;
namespace CY.WebForm.Pages.business
{
@@ -22,6 +23,14 @@
OA_StaffBLL bll_OA_StaffBLL = null;
EC_OrderBasicBLL bll_EC_OrderBasicBLL = null;
public string xiala = "";
+ private static ICacheStrategy CACHE = null;//缂撳瓨鎺ュ彛瀵硅薄
+ public string biaotou = "";
+ public string biaowei = "";
+
+
+ CoreCmsPlanOrderBLL bll_CoreCmsPlanOrderBLL = null;
+ CoreCmsPlanOrderItemBLL bll_CoreCmsPlanOrderItemBLL = null;
+ EC_OrderPrintParameterBLL _eC_OrderPrintParameterBLL = null;
//鍒濆鍖�
public DeliverWorkBookLiShiAnPaiList()
@@ -30,12 +39,18 @@
bll_OA_StaffBLL = new OA_StaffBLL();
_CoreDeliverOrderBLL = new CoreDeliverOrderBLL();
bll_EC_OrderBasicBLL = new EC_OrderBasicBLL();
+ bll_CoreCmsPlanOrderBLL = new CoreCmsPlanOrderBLL();
+ bll_CoreCmsPlanOrderItemBLL = new CoreCmsPlanOrderItemBLL();
+ _eC_OrderPrintParameterBLL = new EC_OrderPrintParameterBLL();
+ CacheFactory.InitializeCacheFactory(new DefaultCacheStrategy());//鍒濆鍖栫紦瀛樺伐鍘�
+ CACHE = CacheFactory.GetCacher();//鍒涘缓缂撳瓨
+ CACHE.TimeOut = 6000;
}
//椤甸潰鍔犺浇
protected void Page_Load(object sender, EventArgs e)
{
- UCPager1.AspNetPager.PageChanged += AspNetPager1_PageChanged;
+ // UCPager1.AspNetPager.PageChanged += AspNetPager1_PageChanged;
if (!IsPostBack)
{
this.selDriver.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, false, false).Where(x => x.SM_Post == "鍙告満"); ;
@@ -45,10 +60,18 @@
this.selDriver.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
-
-
-
- BindList("shifou");
+ 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.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");
+ var stringBuyerName = CACHE.RetrieveObject(CurrentUser.TrueMemberId+ "BuyerName") as string;//浠庣紦瀛樹腑鑾峰彇鏁版嵁璁块棶瀹炵幇灞傜▼搴忛泦
+ if (null != stringBuyerName)
+ {
+ this.selBuyerName.Value = stringBuyerName;
+ }
+ BindList();
}
}
@@ -57,19 +80,53 @@
private void BindList(string shifou="")
{
- var eC_OrderBasics = bll_EC_OrderBasicBLL.GetOrderByPrintTypeId(37).Where(x => x.OrderState == 4);
- foreach (var eC_OrderBasic in eC_OrderBasics)
- {
- xiala += "<option value=\"" + eC_OrderBasic.BuyerName + "\">";
+ //var eC_OrderBasics = bll_EC_OrderBasicBLL.GetOrderByPrintTypeId(37).Where(x => x.OrderState == 4);
+ //foreach (var eC_OrderBasic in eC_OrderBasics)
+ //{
+ // xiala += "<option value=\"" + eC_OrderBasic.BuyerName + "\">";
- }
+ //}
+ CACHE.AddObject(CurrentUser.TrueMemberId + "BuyerName", this.selBuyerName.Value.Trim());//灏嗙▼搴忛泦鍐欏叆缂撳瓨
Pagination pa = new Pagination();
- pa.PageSize = UCPager1.AspNetPager.PageSize;
- pa.PageIndex = UCPager1.AspNetPager.CurrentPageIndex;
+ pa.PageSize = 500;
+ pa.PageIndex = 1;
- var coreDeliverOrders = _CoreDeliverOrderBLL.SelectModelPageLishi(pa, CurrentUser.MemberId, this.selDriver.Value.ToInt32(),this.txtXuexiao.Value.Trim(),this.txtBuyerName.Value.Trim(), this.txtBeginDate.Value.Trim(), this.txtEndDate.Value.Trim(),this.selOrderState.Value, shifou);
+ var coreDeliverOrders = _CoreDeliverOrderBLL.SelectModelPageLishi(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, shifou);
+
+ EC_OrderPrintParameter _eC_OrderPrintParameter = _eC_OrderPrintParameterBLL.GetModel(this.selBuyerName.Value.Trim().ToInt32().Value);
+ InquiryCommonModel _inquiryCommonModel = null;
+ if (null == _eC_OrderPrintParameter)
+ {
+ _inquiryCommonModel = new InquiryCommonModel();
+ }
+ else
+ {
+ _inquiryCommonModel = SerializationHelper.DeSerialize(typeof(InquiryCommonModel), _eC_OrderPrintParameter.PrintParameter) as InquiryCommonModel;
+
+ }
+ var inquiryWorkBookModels = _inquiryCommonModel.InquiryWorkBookList.OrderBy(x => x.WorkBookSizeTxt).ThenBy(x => x.WorkBookNameTxt);
+
+ 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>";
+ 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\" > 鎿嶄綔</th></tr><tr>" + biaotou2 + "<th style=\"text-align:center\" > </th>";
+ }
+ var ids = coreDeliverOrders.Select(x => x.OrderId).ToArray();
+
+ var coreCmsPlanOrders = bll_CoreCmsPlanOrderBLL.GetModelByorderid(this.selBuyerName.Value.Trim().ToInt32().Value).Where(x => ids.Contains(x.id));
+ 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));
+
+
foreach (var coreDeliverOrder in coreDeliverOrders)
{
if (coreDeliverOrder.DriverId.HasValue)
@@ -92,12 +149,99 @@
coreDeliverOrder.DriverName = coreDeliverOrder.DeliveryMoble;
}
}
-
+
+ var cmsPlanOrderItems1 = cmsPlanOrderItems.Where(x => x.orderId == coreDeliverOrder.OrderId);
+ foreach (var inquiryWorkBookModel in inquiryWorkBookModels)
+ {
+ string biaoge = "";
+ var cmsPlanOrderItem = cmsPlanOrderItems1.Where(x => x.name == inquiryWorkBookModel.WorkBookNameTxt && x.specification == inquiryWorkBookModel.WorkBookSizeTxt).FirstOrDefault();
+ if (cmsPlanOrderItem != null)
+ {
+ var coreDeliverOrderItems1 = coreDeliverOrderItems.Where(x => x.PlanOrderId == coreDeliverOrder.OrderId && x.ZYBName == inquiryWorkBookModel.WorkBookNameTxt && x.ZYBSpecification == inquiryWorkBookModel.WorkBookSizeTxt);
+
+ var Number = coreDeliverOrderItems1.Sum(x => x.Number);
+ var LessNumber = coreDeliverOrderItems1.Sum(x => x.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>";
+ }
+ 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>";
+ }
+
+ }
+ 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>";
+ }
+ }
+ else
+ {
+ biaoge += " <td style=\"text-align:center\"> </td> <td style=\"text-align:center\"> <span style=\"color:green;\" ></span></td> ";
+ }
+
+
+
+ }
+ else
+ {
+ biaoge += " <td style=\"text-align:center\"> </td> <td style=\"text-align:center\"> <span style=\"color:green;\" ></span></td> ";
+ }
+
+
+
+ coreDeliverOrder.biaoge += biaoge;
+
+
+
+
+ }
+
+
+
}
+
+
+ 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);
+
+ var coreDeliverOrderItems1 = coreDeliverOrderItems.Where(x => x.ZYBName == inquiryWorkBookModel.WorkBookNameTxt && x.ZYBSpecification == inquiryWorkBookModel.WorkBookSizeTxt && ids.Contains(x.PlanOrderId));
+
+ var Number = coreDeliverOrderItems1.Sum(x => x.Number);
+ var LessNumber = coreDeliverOrderItems1.Sum(x => x.LessNumber);
+ if ((nums - LessNumber - Number) > 0)
+ {
+ 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>";
+ }
+ 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>";
+ }
+
+ }
+ 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></td>";
this.RepClientList.DataSource = coreDeliverOrders;
this.RepClientList.DataBind();
- UCPager1.AspNetPager.RecordCount = pa.RecordCount;
+ // UCPager1.AspNetPager.RecordCount = pa.RecordCount;
}
//鍒嗛〉浜嬩欢
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx.designer.cs
index f5ea454..9140881 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx.designer.cs
@@ -42,13 +42,13 @@
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
- /// txtBuyerName 鎺т欢銆�
+ /// selBuyerName 鎺т欢銆�
/// </summary>
/// <remarks>
/// 鑷姩鐢熸垚鐨勫瓧娈点��
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
- protected global::System.Web.UI.HtmlControls.HtmlInputText txtBuyerName;
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selBuyerName;
/// <summary>
/// txtBeginDate 鎺т欢銆�
@@ -112,14 +112,5 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.Repeater RepClientList;
-
- /// <summary>
- /// UCPager1 鎺т欢銆�
- /// </summary>
- /// <remarks>
- /// 鑷姩鐢熸垚鐨勫瓧娈点��
- /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
- /// </remarks>
- protected global::CY.WebForm.Pages.common.UCPager UCPager1;
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx
index d311f7b..6789853 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx
@@ -135,10 +135,13 @@
<th width="30" style="text-align: center" >
缂栧彿
</th>
- <th style="text-align: center" >
+ <th style="text-align: center;width:120px;" >
+ 閫佽揣鏃堕棿
+ </th>
+ <th width="100" style="text-align: center" >
鐗囧尯
</th>
- <th style="text-align: center" >
+ <th width="120" style="text-align: center" >
瀛︽牎
</th>
<%=biaotou %>
@@ -152,7 +155,10 @@
<td style="text-align: center">
<%#Eval("Bianhao")%> <%--<%#Container.ItemIndex + 1%>--%>
</td>
- <td style="text-align: center">
+ <td style="text-align: center;white-space: nowrap;">
+ <%#Eval("MakeTime")%>
+ </td>
+ <td style="text-align: center">
<%#Eval("pianqu")%>
</td>
<td style="text-align: center">
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs
index 7a4ad04..731425b 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs
@@ -21,6 +21,7 @@
CoreCmsPlanOrderBLL bll_CoreCmsPlanOrderBLL = null;
CoreCmsPlanOrderItemBLL bll_CoreCmsPlanOrderItemBLL = null;
EC_OrderPrintParameterBLL _eC_OrderPrintParameterBLL = null;
+ CoreDeliverOrderBLL bll_CoreDeliverOrderBLL = null;
public string biaotou = "";
public string biaowei = "";
@@ -31,6 +32,7 @@
bll_CoreCmsPlanOrderBLL = new CoreCmsPlanOrderBLL();
bll_CoreCmsPlanOrderItemBLL = new CoreCmsPlanOrderItemBLL();
_eC_OrderPrintParameterBLL = new EC_OrderPrintParameterBLL();
+ bll_CoreDeliverOrderBLL = new CoreDeliverOrderBLL();
}
//椤甸潰鍔犺浇
@@ -102,7 +104,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>";
+ 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> ";
@@ -120,6 +122,14 @@
foreach (var coreCmsPlanOrder in coreCmsPlanOrders)
{
+ //鏌ヨ閫佽揣鏃堕棿
+ var coreDeliverOrder = bll_CoreDeliverOrderBLL.GetModelByorderid(coreCmsPlanOrder.id).Where(x => x.OrderState == 0 || x.OrderState == 1 || x.OrderState == 2).OrderByDescending(x => x.MakeTime).FirstOrDefault();
+ if (coreDeliverOrder != null)
+ {
+ coreCmsPlanOrder.MakeTime = coreDeliverOrder.MakeTime.Value.ToString("yyyy-MM-dd HH:mm");
+ }
+
+
var cmsPlanOrderItems1 = cmsPlanOrderItems.Where(x => x.orderId == coreCmsPlanOrder.id);
foreach (var inquiryWorkBookModel in inquiryWorkBookModels)
{
@@ -138,7 +148,7 @@
{
if (LessNumber + Number > 0)
{
- biaoge += " <td style=\"color: grey;text-align: center;\" > " + Number + " </td> <td style=\"text-align:center\"> <span style=\"color:pink;\" >" + (cmsPlanOrderItem.nums - LessNumber - Number) + " </span></td>";
+ 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>";
}
else
{
@@ -280,7 +290,7 @@
- biaowei = " <td></td> <td style=\"color: grey;text-align: center;\" > " + PlanOrderid.Count +" </td><td style=\"text-align:center\"> </td> <td style=\"text-align:center\"> </td> ";
+ biaowei = " <td></td> <td></td> <td style=\"color: grey;text-align: center;\" > " + PlanOrderid.Count +" </td><td style=\"text-align:center\"> </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 && PlanOrderid.Contains(x.orderId)).Sum(x => x.nums);
@@ -293,7 +303,7 @@
{
if(LessNumber + Number > 0)
{
- biaowei += " <td style=\"color: grey;text-align: center;\" > " + Number + " </td> <td style=\"text-align:center\"> <span style=\"color:pink;\" >" + (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>";
}
else
{
--
Gitblit v1.9.1