From 030609a2b7574d9a2f169a043a1a31cf14b68645 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 06 九月 2021 14:06:53 +0800
Subject: [PATCH] 提交
---
CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanBLL.cs | 14 ++++
CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs | 4 +
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx.cs | 26 ++++++--
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProdactionList.aspx.cs | 2
CY_ECommercePlatform/CY.WebForm/Pages/common/UCPager.ascx.designer.cs | 16 +++--
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.cs | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx | 76 ++++++++++++++++++++++++-
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProdactionList.aspx | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx.designer.cs | 27 +++++++++
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx | 2
CY_ECommercePlatform/CY.WebForm/Pages/common/UCPager.ascx | 2
11 files changed, 149 insertions(+), 24 deletions(-)
diff --git a/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs b/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
index 163716d..f67c6a7 100644
--- a/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
@@ -539,6 +539,10 @@
{
Condition += " and ( DATEDIFF(DAY,GETDATE(),ob.[DeliveryTime]) >7 or DATEDIFF(DAY,GETDATE(),oe.[DelayTime])>7 )";
}
+ else if (DeliveryTime == "閫炬湡")
+ {
+ Condition += " and ( DATEDIFF(DAY,GETDATE(),ob.[DeliveryTime])<=0 or DATEDIFF(DAY,GETDATE(),oe.[DelayTime])<=0 )";
+ }
}
diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanBLL.cs
index 72aa483..6db6161 100644
--- a/CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanBLL.cs
@@ -158,8 +158,18 @@
{
string Condition = " and od.FirmId ='" + FirmId + "' and od.shifouDelivery = 1 ";
- if (!string.IsNullOrEmpty(DeliveredTime) && DeliveredTime!="棰勬湡")
- Condition += " and DATEDIFF(day,od.[DeliverTime],'" + DeliveredTime + "')=0 ";
+ if (!string.IsNullOrEmpty(DeliveredTime) )
+ {
+ if(DeliveredTime != "閫炬湡")
+ {
+ Condition += " and DATEDIFF(day,od.[DeliverTime],'" + DeliveredTime + "')=0 ";
+ }
+ else
+ {
+ Condition += " and DATEDIFF(day,GETDATE(),od.[DeliverTime])<=0 ";
+ }
+ }
+
if (!string.IsNullOrEmpty(CarId))
Condition += " and od.CarId = '" + CarId + "'";
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx
index 00b77a4..190445f 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx
@@ -257,7 +257,7 @@
閫佽揣鏃堕棿锛�
</td>
<td colspan="5">
- <asp:button id="Button0" text="棰勬湡" runat="server" padding="0px" OnClick="btn_Search_Click0" />
+ <asp:button id="Button0" text="閫炬湡" runat="server" padding="0px" OnClick="btn_Search_Click0" />
<asp:button id="Button1" text="鏃ユ湡" runat="server" padding="0px" OnClick="btn_Search_Click1" />
<asp:button id="Button2" text="鏃ユ湡" runat="server" padding="0px" OnClick="btn_Search_Click2" />
<asp:button id="Button3" text="鏃ユ湡" runat="server" padding="0px" OnClick="btn_Search_Click3" />
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.cs
index 2cb44d9..f739ebe 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.cs
@@ -91,7 +91,7 @@
this.selCarIddo.DataBind();
this.selCarIddo.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
- this.Button0.Text = "棰勬湡";
+ this.Button0.Text = "閫炬湡";
this.Button1.Text = DateTime.Now.ToString("yyyy-MM-dd");
this.Button2.Text = DateTime.Now.AddDays(1).ToString("yyyy-MM-dd");
this.Button3.Text = DateTime.Now.AddDays(2).ToString("yyyy-MM-dd");
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx
index d616e43..d91c3a1 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx
@@ -118,6 +118,27 @@
}
);
});
+
+ $(function () {
+ var value_SumPrice = 0;
+ $(".SumPrice").each(function (ii, vv) {
+ value_SumPrice += parseFloat($(vv).text());
+ });
+ $("#AllMoney").html(value_SumPrice.toFixed(2));
+
+ var value_PayedMoney = 0;
+ $(".PayedMoney").each(function (ii, vv) {
+ value_PayedMoney += parseFloat($(vv).text());
+ });
+ $("#AlreadyMoney").html(value_PayedMoney.toFixed(2));
+
+ var value_UnPayedMoney = 0;
+ $(".UnPayedMoney").each(function (ii, vv) {
+ value_UnPayedMoney += parseFloat($(vv).text());
+ });
+ $("#NoMoney").html(value_UnPayedMoney.toFixed(2));
+ });
+
</script>
<style type="text/css">
.tableStyleXS th { padding: 1px 0 1px 3px; background-image:none; border-bottom:1px solid #CCC; }
@@ -144,6 +165,11 @@
cursor: pointer;
width: 26px;
}
+
+
+ .StatisticsMoney td { color: #FF5500; }
+ .StatisticsMoney span { color: #FF5500; font-weight: bold; }
+
</style>
</head>
<body>
@@ -399,7 +425,7 @@
PayState:<%#Eval("PayState")%>
}" id='ckBox<%#Container.ItemIndex%>' id='ckBox<%#Container.ItemIndex%>' class='ckBox' />
</td>
- <td>
+ <td class="ItemIndex">
<%#Container.ItemIndex +1 /*(UCPager1.PageSize *( UCPager1.PageIndex-1)+1)*/%>
</td>
<td style="text-align: center;">
@@ -438,14 +464,14 @@
<%#Eval("KaipiaoshenqingName").ToString()==""?"鏈敵璇�":Eval("KaipiaoshenqingName").ToString()%>
</td>
- <td>
+ <td class="SumPrice">
<%#Eval("SumPrice", "{0:F}")%>
</td>
- <td>
+ <td class="PayedMoney">
<%#Eval("TradingSingle.PayedMoney", "{0:F}")%>
</td>
- <td>
+ <td class="UnPayedMoney">
<%#Eval("UnPayedMoney","{0:F}")%>
</td>
@@ -493,6 +519,22 @@
</itemtemplate>
</asp:repeater>
</tbody>
+
+ <tr class="StatisticsMoney">
+ <td colspan="12" class="ali03">
+ 鏌ヨ椤圭粺璁★細
+ </td>
+ <td class="ali01" >
+ <span id="AllMoney" runat="server"></span>
+ </td>
+ <td class="ali01">
+ <span id="AlreadyMoney" runat="server"></span>
+ </td>
+ <td class="ali01">
+ <span id="NoMoney" runat="server"></span>
+ </td>
+
+ </tr>
</table>
<%--<uc:ucpager id="UCPager1" runat="server" />--%>
</div>
@@ -606,6 +648,32 @@
}
);
+ var i = 1;
+
+ $(".ItemIndex").each(function (ii, vv) {
+
+ $(vv).text(i)
+ i = i + 1;
+ });
+
+
+ var value_SumPrice = 0;
+ $(".SumPrice").each(function (ii, vv) {
+ value_SumPrice += parseFloat($(vv).text());
+ });
+ $("#AllMoney").html(value_SumPrice.toFixed(2));
+
+ var value_PayedMoney = 0;
+ $(".PayedMoney").each(function (ii, vv) {
+ value_PayedMoney += parseFloat($(vv).text());
+ });
+ $("#AlreadyMoney").html(value_PayedMoney.toFixed(2));
+
+ var value_UnPayedMoney = 0;
+ $(".UnPayedMoney").each(function (ii, vv) {
+ value_UnPayedMoney += parseFloat($(vv).text());
+ });
+ $("#NoMoney").html(value_UnPayedMoney.toFixed(2));
//if (!isCan) {
// // alertMsg('璇烽�夋嫨鏈彈鐞嗙殑璁㈠崟锛�');
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx.cs
index 9a045c4..34b1080 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx.cs
@@ -453,6 +453,7 @@
{
// UCPager1.AspNetPager.PageChanged += AspNetPager_PageChanged;
btn_Search.Click += btn_Search_Click;
+
txtCommission.Value = CY.Config.WebInfo.Instance.FirmOrderAgencyFee;
List<EC_OrderDialogue> dialogues = _eC_OrderBasicBLL.SelectPropertyChangeRequest(CurrentUser.MemberId) as List<EC_OrderDialogue>;
@@ -513,6 +514,7 @@
#region 鏌ヨ
+
/// <summary>
/// 鎼滅储鎸夐挳鐐瑰嚮浜嬩欢
/// </summary>
@@ -521,11 +523,11 @@
private void btn_Search_Click(object sender, EventArgs e)
{
- /* if (this.txtCustormerName.Value.Trim() == "")
- {
- Response.Write("瀹㈡埛鍚嶇О涓嶈兘涓虹┖锛岃杈撳叆瀹㈡埛鍚嶇О鍐嶆煡璇⑩�︹��");
- return;
- }*/
+ //if (this.txtCustormerName.Value.Trim() == "")
+ //{
+ // Response.Write("瀹㈡埛鍚嶇О涓嶈兘涓虹┖锛岃杈撳叆瀹㈡埛鍚嶇О鍐嶆煡璇⑩�︹��");
+ // return;
+ //}
Dictionary<int, object> searchParam = new Dictionary<int, object>();
SetParamValue(searchParam, 1, CurrentUser.MemberId);
@@ -556,12 +558,24 @@
// AspNetPager_PageChanged(UCPager1.AspNetPager, new EventArgs());
Infrastructure.Query.Pagination pagination = new Infrastructure.Query.Pagination()
{
- PageSize = 100,// UCPager1.AspNetPager.PageSize,
+ PageSize = 10000,// UCPager1.AspNetPager.PageSize,
PageIndex = 1// UCPager1.AspNetPager.CurrentPageIndex
};
IEnumerable<EC_OrderBasic> result = _eC_OrderBasicBLL.SelectModelPage_Seller(pagination, SearchParam);//.Where(x=>x.Quchudingdan == 2);
rptData.DataSource = result;
rptData.DataBind();
+
+ //EC_OrderBasic m_EC_OrderBasic = _eC_OrderBasicBLL.SumOrderMoney_receive(pagination, SearchParam);
+ //if (m_EC_OrderBasic != null)
+ //{
+ // //this.AllMoney.InnerText = (m_EC_OrderBasic.OrAllTradingMoney * 9 ?? 0).ToString("0.00");
+ // //this.AlreadyMoney.InnerText = (m_EC_OrderBasic.OrAllPayedMoney * 9 ?? 0).ToString("0.00");
+ // //this.NoMoney.InnerText = (m_EC_OrderBasic.OrAllUnPayedMoney * 9 ?? 0).ToString("0.00");
+ // this.AllMoney.InnerText = (m_EC_OrderBasic.OrAllTradingMoney ?? 0).ToString("0.00");
+ // this.AlreadyMoney.InnerText = (m_EC_OrderBasic.OrAllPayedMoney ?? 0).ToString("0.00");
+ // this.NoMoney.InnerText = (m_EC_OrderBasic.OrAllUnPayedMoney ?? 0).ToString("0.00");
+ //}
+
}
/// <summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx.designer.cs
index 8d290f2..7f2b494 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx.designer.cs
@@ -202,5 +202,32 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.Repeater rptData;
+
+ /// <summary>
+ /// AllMoney 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl AllMoney;
+
+ /// <summary>
+ /// AlreadyMoney 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl AlreadyMoney;
+
+ /// <summary>
+ /// NoMoney 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl NoMoney;
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProdactionList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProdactionList.aspx
index 750e46a..9c07715 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProdactionList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProdactionList.aspx
@@ -51,7 +51,7 @@
<option value ="7澶�"> </option>
<option value ="涓�鍛ㄥ悗"> </option>
</select>--%>
- <asp:button id="Button0" text="棰勬湡" runat="server" padding="0px" OnClick="btn_Search_Click0" />
+ <asp:button id="Button0" text="閫炬湡" runat="server" padding="0px" OnClick="btn_Search_Click0" />
<asp:button id="Button1" text="鏃ユ湡" runat="server" padding="0px" OnClick="btn_Search_Click1" />
<asp:button id="Button2" text="鏃ユ湡" runat="server" padding="0px" OnClick="btn_Search_Click2" />
<asp:button id="Button3" text="鏃ユ湡" runat="server" padding="0px" OnClick="btn_Search_Click3" />
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProdactionList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProdactionList.aspx.cs
index b7a849c..000af42 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProdactionList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProdactionList.aspx.cs
@@ -194,7 +194,7 @@
this.selBusinessManager.DataValueField = "Keyid";
this.selBusinessManager.DataBind();
this.selBusinessManager.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
- this.Button0.Text = "棰勬湡";
+ this.Button0.Text = "閫炬湡";
this.Button1.Text = "鏄庡ぉ";
this.Button2.Text = "鍚庡ぉ";
this.Button3.Text = "3澶�";
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/common/UCPager.ascx b/CY_ECommercePlatform/CY.WebForm/Pages/common/UCPager.ascx
index e6b1393..a6551b8 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/common/UCPager.ascx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/common/UCPager.ascx
@@ -29,7 +29,7 @@
</script>
<div id="page">
-<webdiyer:AspNetPager ID="AspNetPager1" runat="server" CssClass="paginator" CurrentPageButtonPosition="Center" CustomInfoHTML="鍏�<font style='font-size:13'>%RecordCount%</font>鏉�" ShowCustomInfoSection="Left" Width="100%" CustomInfoSectionWidth="100px" PageIndexBoxType="TextBox" ShowPageIndexBox="Always" SubmitButtonText="Go" TextAfterPageIndexBox="椤�" AlwaysShow="true" TextBeforePageIndexBox="杞埌" PrevPageText="涓婁竴椤�" NextPageText="涓嬩竴椤�" FirstPageText="棣栭〉" LastPageText="鏈〉" PageSize="15" CurrentPageIndex="1">
+<webdiyer:AspNetPager ID="AspNetPager1" runat="server" CssClass="paginator" CurrentPageButtonPosition="Center" CustomInfoHTML="鍏�<font style='font-size:13'>%RecordCount%</font>鏉�" ShowCustomInfoSection="Left" Width="100%" CustomInfoSectionWidth="100px" PageIndexBoxType="TextBox" ShowPageIndexBox="Always" SubmitButtonText="Go" TextAfterPageIndexBox="椤�" AlwaysShow="true" TextBeforePageIndexBox="杞埌" PrevPageText="涓婁竴椤�" NextPageText="涓嬩竴椤�" FirstPageText="棣栭〉" LastPageText="鏈〉" PageSize="25" CurrentPageIndex="1">
</webdiyer:AspNetPager>
<div class="CB"></div>
</div>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/common/UCPager.ascx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/common/UCPager.ascx.designer.cs
index 25ae5a8..f137e52 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/common/UCPager.ascx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/common/UCPager.ascx.designer.cs
@@ -2,16 +2,18 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.common {
-
-
- public partial class UCPager {
-
+namespace CY.WebForm.Pages.common
+{
+
+
+ public partial class UCPager
+ {
+
/// <summary>
/// AspNetPager1 鎺т欢銆�
/// </summary>
--
Gitblit v1.9.1