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 | 6 +-
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx.designer.cs | 9 ++++
CY_ECommercePlatform/CY.BLL/OA/CoreDeliverOrderBLL.cs | 23 ++++++++++-
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx | 26 ++++++++++--
4 files changed, 54 insertions(+), 10 deletions(-)
diff --git a/CY_ECommercePlatform/CY.BLL/OA/CoreDeliverOrderBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/CoreDeliverOrderBLL.cs
index c069f65..040e438 100644
--- a/CY_ECommercePlatform/CY.BLL/OA/CoreDeliverOrderBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/OA/CoreDeliverOrderBLL.cs
@@ -164,9 +164,28 @@
/// <param name="pa"></param>
/// <returns></returns>
public IEnumerable<CoreDeliverOrder> SelectModelPage(Pagination pa, Guid FirmId, int? DriverId, string shipAddress,
- string BuyerName, string createTimeStart, string createTimeEnd)
+ string BuyerName, string createTimeStart, string createTimeEnd, string OrderState)
{
- string Condition = " and b.FirmId ='" + FirmId + "' and a.OrderState = 0 ";
+ string Condition = " and b.FirmId ='" + FirmId + "' and b.DeliverState != 2 ";
+
+ if (!string.IsNullOrEmpty(OrderState))
+ {
+ if (OrderState != "4")
+ {
+ Condition += " and a.OrderState = " + OrderState + " ";
+ }
+ else
+ {
+ Condition += " and a.OrderState in( 0,1 ) ";
+ }
+ }
+ else
+ {
+ Condition += " and a.OrderState in( 0,1,2 ) ";
+
+
+ }
+
if (DriverId.HasValue)
{
var oA_Staff = staffBLL.GetModelByKeyid(DriverId);
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx
index c34fb1f..5434f94 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx
@@ -130,7 +130,17 @@
<td>
<input id='txtXuexiao' runat="server" maxlength='50' />
</td>
-
+ <td class="ali03" >
+ 閫佽揣鐘舵�侊細
+ </td>
+ <td >
+ <select keepdefaultstyle='true' id='selOrderState' runat="server" >
+ <option value="">璇烽�夋嫨</option>
+ <option value="4" selected="selected" >鏈��</option>
+
+ <option value="2" >宸查��</option>
+ </select>
+ </td>
<td >
<asp:Button ID="btn_Search" Text="鏌ヨ" runat="server" OnClick="btn_Search_Click" /> <input type="button" value='閲嶇疆' onclick='document.body.innerHTML="";window.location=window.location;' />
@@ -161,6 +171,9 @@
</th>
<th style="text-align: center">
鍙告満
+ </th>
+ <th style="text-align: center">
+ 閫佽揣鐘舵��
</th>
<%=biaotou %>
@@ -193,11 +206,14 @@
<td style="text-align: center">
<%#Eval("DriverName")%>
</td>
- <%#Eval("biaoge")%>
- <td class="Operate " style="text-align: center">
+ <td style="text-align: center">
+ <%#Eval("OrderStateName")%>
+ </td>
+ <%#Eval("biaoge")%>
+ <td class="Operate " style="text-align: center;white-space: nowrap;">
<span onclick="onViewCarInsurance('<%#Eval("id")%>')">鏌ョ湅鏄庣粏</span>
- <span menu_member_case_id="case_onEdit" menu_member_case_name="淇敼" onclick="onEdit('<%#Eval("id")%>')">淇敼</span>
- <span menu_member_case_id="case_onDele" menu_member_case_name="鎾ら攢" onclick="onDele('<%#Eval("id")%>')">鎾ら攢</span>
+ <span menu_member_case_id="case_onEdit" menu_member_case_name="淇敼" style="<%#Eval("OrderState").ToString()!="0"?"display:none;":"" %>" onclick="onEdit('<%#Eval("id")%>')">淇敼</span>
+ <span menu_member_case_id="case_onDele" menu_member_case_name="鎾ら攢" style="<%#Eval("OrderState").ToString()!="0"?"display:none;":"" %>" onclick="onDele('<%#Eval("id")%>')">鎾ら攢</span>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx.cs
index bfc4073..ab171a4 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx.cs
@@ -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);
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 dd9f6e5..694b0ab 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx.designer.cs
@@ -87,6 +87,15 @@
protected global::System.Web.UI.HtmlControls.HtmlInputText txtXuexiao;
/// <summary>
+ /// selOrderState 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selOrderState;
+
+ /// <summary>
/// btn_Search 鎺т欢銆�
/// </summary>
/// <remarks>
--
Gitblit v1.9.1