From e4ee60ed94d24e394a7895daa9fb98df813e5953 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 12 十二月 2025 14:44:24 +0800
Subject: [PATCH] 提交
---
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs | 14 +++++++
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx.cs | 18 ++++++++-
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx | 11 +++++
CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs | 11 +++++
CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs | 10 +++++
CY_ECommercePlatform/CY.BLL/OA/CoreDeliverOrderBLL.cs | 13 +++++-
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx | 5 ++
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx.cs | 26 ++++++++++--
8 files changed, 97 insertions(+), 11 deletions(-)
diff --git a/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs b/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
index d15a404..bfa8fd8 100644
--- a/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
@@ -292,6 +292,17 @@
return _eC_OrderBasicDAL.GetOrderByIds(orderIds);
}
+
+ /// <summary>
+ /// 鏍规嵁璁㈠崟缂栧彿鑾峰彇璁㈠崟
+ /// </summary>
+ /// <param name="orderIds">璁㈠崟缂栧彿</param>
+ /// <returns></returns>
+ public IEnumerable<EC_OrderBasic> GetOrderByPrintTypeId(int PrintTypeId)
+ {
+ return _eC_OrderBasicDAL.GetOrderByPrintTypeId(PrintTypeId);
+ }
+
/// <summary>
/// 鏍规嵁璁㈠崟缂栧彿鑾峰彇鑷姩澶栧崗璁㈠崟
/// </summary>
diff --git a/CY_ECommercePlatform/CY.BLL/OA/CoreDeliverOrderBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/CoreDeliverOrderBLL.cs
index 75da3cd..d93cda7 100644
--- a/CY_ECommercePlatform/CY.BLL/OA/CoreDeliverOrderBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/OA/CoreDeliverOrderBLL.cs
@@ -207,7 +207,7 @@
/// <param name="pa"></param>
/// <returns></returns>
public IEnumerable<CoreDeliverOrder> SelectModelPageLishi(Pagination pa, Guid FirmId, int? DriverId, string shipAddress,
- string BuyerName, string createTimeStart, string createTimeEnd,string OrderState)
+ string BuyerName, string createTimeStart, string createTimeEnd,string OrderState,string shifou)
{
string Condition = " and b.FirmId ='" + FirmId + "' ";
@@ -217,7 +217,16 @@
}
else
{
- Condition += " and a.OrderState in( 0,1,2 ) ";
+ if (!string.IsNullOrEmpty(shifou))
+ {
+ Condition += " and a.OrderState in( 0,1 ) ";
+ }
+ else
+ {
+ Condition += " and a.OrderState in( 0,1,2 ) ";
+ }
+
+
}
if (DriverId.HasValue)
{
diff --git a/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs b/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs
index 9a3e3d9..8f6da91 100644
--- a/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs
+++ b/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs
@@ -166,6 +166,16 @@
/// <returns></returns>
IEnumerable<EC_OrderBasic> GetOrderByIds(string orderIds);
+
+
+ /// <summary>
+ /// 鏍规嵁璁㈠崟缂栧彿鑾峰彇璁㈠崟
+ /// </summary>
+ /// <param name="orderIds">璁㈠崟缂栧彿</param>
+ /// <returns></returns>
+ IEnumerable<EC_OrderBasic> GetOrderByPrintTypeId(int PrintTypeId);
+
+
/// <summary>
/// 鍙戣捣璁㈠崟灞炴�ф敼鍙樿姹�
/// </summary>
diff --git a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
index 37689ff..257421a 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
@@ -1530,6 +1530,20 @@
}
+
+ /// <summary>
+ /// 鏍规嵁绫诲瀷鏌ヨ 璁㈠崟
+ /// </summary>
+ /// <param name="orderId">璁㈠崟缂栧彿</param>
+ /// <returns></returns>
+ 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));
+ return result;
+ }
+
+
/// <summary>
/// 鏍规嵁瀹㈡埛ID鍜岃鍗曟敮浠樼姸鎬佽幏鍙栬鍗曞垪琛�
/// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx
index 6c68489..0e670d1 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx
@@ -105,7 +105,10 @@
瀹㈡埛鍚嶇О锛�
</td>
<td>
- <input id='txtBuyerName' runat="server" maxlength='100' />
+ <input id='txtBuyerName' runat="server" maxlength='100' list="browsers" />
+ <datalist id="browsers">
+ <%=xiala %>
+ </datalist>
</td>
<td class="ali03">
閫佽揣鏃堕棿锛�
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx.cs
index 055a8be..f1d734c 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx.cs
@@ -20,6 +20,8 @@
{
CoreDeliverOrderBLL _CoreDeliverOrderBLL = null;
OA_StaffBLL bll_OA_StaffBLL = null;
+ EC_OrderBasicBLL bll_EC_OrderBasicBLL = null;
+ public string xiala = "";
//鍒濆鍖�
public DeliverWorkBookAnPaiList()
@@ -27,6 +29,7 @@
bll_OA_StaffBLL = new OA_StaffBLL();
_CoreDeliverOrderBLL = new CoreDeliverOrderBLL();
+ bll_EC_OrderBasicBLL = new EC_OrderBasicBLL();
}
//椤甸潰鍔犺浇
@@ -41,9 +44,9 @@
this.selDriver.DataBind();
this.selDriver.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
-
-
+
+
BindList();
}
@@ -53,6 +56,13 @@
//缁戝畾鏁版嵁
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 + "\">";
+
+
+ }
Pagination pa = new Pagination();
pa.PageSize = UCPager1.AspNetPager.PageSize;
pa.PageIndex = UCPager1.AspNetPager.CurrentPageIndex;
@@ -75,6 +85,10 @@
{
coreDeliverOrder.DriverName = oA_Staff1.Name;
}
+ else
+ {
+ coreDeliverOrder.DriverName = coreDeliverOrder.DeliveryMoble;
+ }
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx
index 47b01df..5ddfbe8 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx
@@ -89,6 +89,7 @@
}
$(function () {
$(".AlreadyReply").remove();
+
});
</script>
<style type="text/css">
@@ -105,7 +106,15 @@
瀹㈡埛鍚嶇О锛�
</td>
<td>
- <input id='txtBuyerName' runat="server" maxlength='100' />
+
+ <input id='txtBuyerName' runat="server" maxlength='100' list="browsers" />
+ <datalist id="browsers">
+ <%=xiala %>
+ </datalist>
+
+
+
+
</td>
<td class="ali03">
閫佽揣鏃堕棿锛�
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx.cs
index ba75b6d..828a983 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx.cs
@@ -20,6 +20,8 @@
{
CoreDeliverOrderBLL _CoreDeliverOrderBLL = null;
OA_StaffBLL bll_OA_StaffBLL = null;
+ EC_OrderBasicBLL bll_EC_OrderBasicBLL = null;
+ public string xiala = "";
//鍒濆鍖�
public DeliverWorkBookLiShiAnPaiList()
@@ -27,6 +29,7 @@
bll_OA_StaffBLL = new OA_StaffBLL();
_CoreDeliverOrderBLL = new CoreDeliverOrderBLL();
+ bll_EC_OrderBasicBLL = new EC_OrderBasicBLL();
}
//椤甸潰鍔犺浇
@@ -41,23 +44,32 @@
this.selDriver.DataBind();
this.selDriver.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
-
-
+
- BindList();
+
+ BindList("shifou");
}
}
//缁戝畾鏁版嵁
- private void BindList()
+ 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 + "\">";
+
+
+ }
+
Pagination pa = new Pagination();
pa.PageSize = UCPager1.AspNetPager.PageSize;
pa.PageIndex = UCPager1.AspNetPager.CurrentPageIndex;
- 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);
+ 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);
foreach (var coreDeliverOrder in coreDeliverOrders)
{
if (coreDeliverOrder.DriverId.HasValue)
@@ -75,6 +87,10 @@
{
coreDeliverOrder.DriverName = oA_Staff1.Name;
}
+ else
+ {
+ coreDeliverOrder.DriverName = coreDeliverOrder.DeliveryMoble;
+ }
}
}
--
Gitblit v1.9.1