username@email.com
2021-09-06 030609a2b7574d9a2f169a043a1a31cf14b68645
提交
11个文件已修改
165 ■■■■ 已修改文件
CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanBLL.cs 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx 76 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx.cs 26 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx.designer.cs 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProdactionList.aspx 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProdactionList.aspx.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/common/UCPager.ascx 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/common/UCPager.ascx.designer.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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 )";
                }
            }
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!="预期")
            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 + "'";
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" />&nbsp;&nbsp;
                         <asp:button id="Button0" text="逾期" runat="server"  padding="0px" OnClick="btn_Search_Click0" />&nbsp;&nbsp;
                        <asp:button id="Button1" text="日期" runat="server"  padding="0px" OnClick="btn_Search_Click1" />&nbsp;&nbsp;
                        <asp:button id="Button2" text="日期" runat="server"  padding="0px" OnClick="btn_Search_Click2" />&nbsp;&nbsp;
                        <asp:button id="Button3" text="日期" runat="server"  padding="0px" OnClick="btn_Search_Click3" />&nbsp;&nbsp;
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");
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('请选择未受理的订单!');
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>
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;
    }
}
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" />&nbsp;&nbsp;
                          <asp:button id="Button0" text="逾期" runat="server"  padding="0px" OnClick="btn_Search_Click0" />&nbsp;&nbsp;
                          <asp:button id="Button1" text="日期" runat="server"  padding="0px" OnClick="btn_Search_Click1" />&nbsp;&nbsp;
                        <asp:button id="Button2" text="日期" runat="server"  padding="0px" OnClick="btn_Search_Click2" />&nbsp;&nbsp;
                        <asp:button id="Button3" text="日期" runat="server"  padding="0px" OnClick="btn_Search_Click3" />&nbsp;&nbsp;
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天";
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>
CY_ECommercePlatform/CY.WebForm/Pages/common/UCPager.ascx.designer.cs
@@ -2,15 +2,17 @@
// <自动生成>
//     此代码由工具生成。
//
//     对此文件的更改可能会导致不正确的行为,并且如果
//     重新生成代码,这些更改将会丢失。
//     对此文件的更改可能导致不正确的行为,如果
//     重新生成代码,则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace CY.WebForm.Pages.common {
namespace CY.WebForm.Pages.common
{
    
    
    public partial class UCPager {
    public partial class UCPager
    {
        
        /// <summary>
        /// AspNetPager1 控件。