送货单逾期不要  就是要订单没有送货的逾期    完成    送货管理下   未送货订单        /Pages/business/OrderSonghuoanchiList.aspx    01

送货安排 按照地址自动排序 完成

外协订单也要点 受理 完工 送货
12个文件已修改
3个文件已添加
1268 ■■■■ 已修改文件
CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs 94 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanBLL.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.Model/EC/EC_OrderBasic.cs 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx 48 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanZhuyishixiang.aspx.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWork.aspx 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWork.aspx.cs 188 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWork.aspx.designer.cs 53 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.cs 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderSonghuoanchiList.aspx 203 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderSonghuoanchiList.aspx.cs 357 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderSonghuoanchiList.aspx.designer.cs 224 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/js/business/Order.js 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
@@ -674,6 +674,100 @@
        /// <summary>
        /// 查询客户预付款列表
        /// </summary>
        /// <param name="pa"></param>
        /// <returns></returns>
        public IEnumerable<EC_OrderBasic> GetModelPageListForSonghuoyanchis(Pagination pa, string DeliveryTime, string Province, string City, string County, string BuyerName, string BusinessManagerId, string SellerOrderId, string DocumentName, Guid SellerId)
        {
            string Condition = " and ( ob.[OrderState] ='1' or ob.[OrderState] ='2' or ob.[OrderState] ='3'  or ob.[OrderState] ='4' ) and SellerId='" + SellerId + "' ";
            if (!string.IsNullOrEmpty(DeliveryTime))
            {
                if (DeliveryTime == "明天")
                {
                    Condition += " and (  DATEDIFF(DAY,GETDATE(),ob.[DeliveryTime])=1 or  DATEDIFF(DAY,GETDATE(),oe.[DelayTime])=1 )";
                }
                else if (DeliveryTime == "后天")
                {
                    Condition += " and  (  DATEDIFF(DAY,GETDATE(),ob.[DeliveryTime])=2 or  DATEDIFF(DAY,GETDATE(),oe.[DelayTime])=2 )";
                }
                else if (DeliveryTime == "3天")
                {
                    Condition += " and  (  DATEDIFF(DAY,GETDATE(),ob.[DeliveryTime])=3 or  DATEDIFF(DAY,GETDATE(),oe.[DelayTime])=3 )";
                }
                else if (DeliveryTime == "4天")
                {
                    Condition += " and  (  DATEDIFF(DAY,GETDATE(),ob.[DeliveryTime])=4 or  DATEDIFF(DAY,GETDATE(),oe.[DelayTime])=4 )";
                }
                else if (DeliveryTime == "5天")
                {
                    Condition += " and (   DATEDIFF(DAY,GETDATE(),ob.[DeliveryTime])=5 or  DATEDIFF(DAY,GETDATE(),oe.[DelayTime])=5) ";
                }
                else if (DeliveryTime == "6天")
                {
                    Condition += " and  (  DATEDIFF(DAY,GETDATE(),ob.[DeliveryTime])=6 or  DATEDIFF(DAY,GETDATE(),oe.[DelayTime])=6) ";
                }
                else if (DeliveryTime == "7天")
                {
                    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]) >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 )";
                }
            }
            if (!string.IsNullOrEmpty(Province))
                Condition += string.Format(" and CustomerCommunications.Province='{0}'", Province);
            if (!string.IsNullOrEmpty(City))
                Condition += string.Format(" and CustomerCommunications.City='{0}'", City);
            if (!string.IsNullOrEmpty(County))
                Condition += string.Format(" and CustomerCommunications.County='{0}'", County);
            if (!string.IsNullOrEmpty(BuyerName))
            {
                Condition += " and  ob.BuyerName like '%" + BuyerName + "%'";
            }
            if (!string.IsNullOrEmpty(BusinessManagerId))
            {
                Condition += string.Format(" and oe.BusinessManagerId='{0}'", BusinessManagerId);
            }
            if (!string.IsNullOrEmpty(SellerOrderId))
            {
                Condition += " and  ob.SellerOrderId like '%" + SellerOrderId + "%'"; ;
            }
            if (!string.IsNullOrEmpty(DocumentName))
            {
                Condition += " and  ob.DocumentName like '%" + DocumentName + "%'"; ;
            }
            Query query = new Query();
            IList<Criterion> criterias = new List<Criterion>()
            {
                new Criterion("", Condition),
                new Criterion("orderBy","   [DeliveryTime] DESC ")
            };
            query.Criteria = criterias;
            return _eC_OrderBasicDAL.SelectModelPage_weiwangong(query, pa);
        }
        /// <summary>
        /// 根据新增订单操作,并修改订单状态
CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanBLL.cs
@@ -157,7 +157,7 @@
  string CarId, string DriverId,string trueMemberId ="", string CustormerName = "", string BusinessManager = "")
        {
            string Condition = " and od.FirmId ='" + FirmId + "' and od.shifouDelivery = 1 ";
            string sort = " case when Sort is null then 1 else 0 end asc,Sort asc   ";
            string sort = " Dizhi asc   ";
            if (!string.IsNullOrEmpty(DeliveredTime) )
            {
                if(DeliveredTime != "逾期")
@@ -168,7 +168,7 @@
                else
                {
                    Condition += " and DATEDIFF(day,GETDATE(),od.[DeliverTime])<0 and od.[DeliveredTime] is null  ";
                    sort = "  DeliverTime desc,Sort asc   ";
                    sort = "  DeliverTime desc,Dizhi asc   ";
                }
            }
           
CY_ECommercePlatform/CY.Model/EC/EC_OrderBasic.cs
@@ -132,6 +132,26 @@
            get { return _documentname; }
        }
        /// <summary>
        /// 印件名称
        /// </summary>
        public string Shifoubiaohongwangong
        {
            get;
            set;
        }
        /// <summary>
        /// 印件名称
        /// </summary>
        public string Shifoubiaohongsonghuo
        {
            get;
            set;
        }
        /// <summary>
        /// 交货时间
        /// </summary>
CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
@@ -1893,6 +1893,7 @@
    <Content Include="Pages\business\DeliverPlanPaiche.aspx" />
    <Content Include="Pages\business\DeliverPlanShifou.aspx" />
    <Content Include="Pages\business\DeliverPlanLishiPrint.aspx" />
    <Content Include="Pages\business\OrderSonghuoanchiList.aspx" />
    <Content Include="Pages\business\OrderUpLoadLiuyang.aspx" />
    <Content Include="Pages\business\WaixieOrderPrint.aspx" />
    <Content Include="Pages\business\Waixiefukuanweikaipiao.aspx" />
@@ -3392,6 +3393,13 @@
    <Compile Include="Pages\business\DeliverPlanLishiPrint.aspx.designer.cs">
      <DependentUpon>DeliverPlanLishiPrint.aspx</DependentUpon>
    </Compile>
    <Compile Include="Pages\business\OrderSonghuoanchiList.aspx.cs">
      <DependentUpon>OrderSonghuoanchiList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="Pages\business\OrderSonghuoanchiList.aspx.designer.cs">
      <DependentUpon>OrderSonghuoanchiList.aspx</DependentUpon>
    </Compile>
    <Compile Include="Pages\business\OrderUpLoadLiuyang.aspx.cs">
      <DependentUpon>OrderUpLoadLiuyang.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx
@@ -434,7 +434,7 @@
                          &nbsp; &nbsp; <input type="button" value='新增送货'  onclick='ToAddorder();'  /> &nbsp; &nbsp;
                              <input type="button" value='派车' onclick='ToAllAccept3();' /> &nbsp; &nbsp;
                         <input type="button" value='单据移交' onclick='ToAllAccept4();' />
                       <%--  <input type="button" value='单据移交' onclick='ToAllAccept4();' /> --%>
                         &nbsp;&nbsp;<input type="button" value='打印全部' onclick='ToPrintdelev();' />
                            
                    </td>
@@ -495,9 +495,9 @@
                        <th style="text-align: center;" width="70">
                            要求到达时间
                        </th>
                        <th style="text-align: center;"width="100">
                       <%-- <th style="text-align: center;"width="100">
                            实际到达时间
                        </th>
                        </th>--%>
                        <th width="70">
                           业务经理
                        </th>
@@ -510,32 +510,34 @@
                        
                        
                        <th width="60">
                            货单数量
                            订单数量
                        </th>
                         <th width="60">
                       <%--  <th width="60">
                            车辆
                        </th>
                        </th>--%>
                         <th width="60">
                            驾驶员
                        </th>
                        <th width="200">
                            问题反馈
                        </th>
                       <%-- <th width="200">
                           问题反馈 </th>
                           --%>
                        <th width="200">
                            注意事项
                        </th>
                        <th width="200">
                       <%-- <th width="200">
                            工作考评
                        </th>
                        <th width="60">
                            移交状态
                        </th>
                        </th>--%>
                          <th width="60">
                            打印送货单
                        </th>
                         <th width="60">
                        <%-- <th width="60">
                            送货单图片
                        </th>
                        </th>--%>
                    </tr>
                </thead>
                <tbody>
@@ -561,9 +563,9 @@
                                <td>
                                    <%#Eval("DeliverTime", "{0:yyyy-MM-dd}")%>
                                </td>
                                <td>
                                <%--<td>
                                      <%#Eval("DeliveredTime", "{0:yyyy-MM-dd}")%>
                                </td>
                                </td>--%>
                                 <td>
                                    <%#Eval("BusinessManager")%>
                                </td>
@@ -577,30 +579,30 @@
                                <td>
                                   <%#Eval("shuliang")%>  
                                </td>
                                <td>
                                <%--<td>
                                    <%#Eval("CarName")%>
                                </td>
                                </td>--%>
                                <td>
                                    <%#Eval("DriverName")%>
                                </td>
                                 <td>
                                <%-- <td>
                                    <%#Eval("wentifankui")%>
                                </td>
                                </td>--%>
                                 <td>
                                 <a href='javascript:void(0)' title='点击修改注意事项' class='a_under' onclick='ViewZhuyishixiang("<%#Eval("Keyid")%>","<%#Eval("BuyerId")%>","<%#Eval("DeliverTime", "{0:yyyy-MM-dd}")%>")'> <%#Eval("Zhuyishixiang").ToString()==""?"修改注意事项":Eval("Zhuyishixiang")%>    </a>    
                                </td>
                                  <td>
                                  <%--<td>
                                   <a href='javascript:void(0)' title='点击修改工作考评' class='a_under' onclick='ViewGongzuokaoping("<%#Eval("Keyid")%>","<%#Eval("BuyerId")%>","<%#Eval("DeliverTime", "{0:yyyy-MM-dd}")%>")' ><%#Eval("Gongzuokaoping").ToString()==""?"修改工作考评":Eval("Gongzuokaoping")%>    </a>    
                                </td>
                                <td style="text-align: center;">
                                    <%#Eval("TransferName")==null || Eval("TransferName").ToString()==""?"未移交":Eval("TransferName")%>
                                </td>
                                </td>--%>
                                   <td>
                                 <a href='javascript:void(0)' title='打印送货单' class='a_under' onclick='ToPrintDriverorder("<%#Eval("Keyid")%>")'>  打印  </a>    
                                </td>
                                 <td>
                                 <%--<td>
                                 <a href='javascript:void(0)' title='送货单图片' class='a_under' onclick='onViewuplod("<%#Eval("Keyid")%>")'>  送货单图片  </a>    
                                </td>
                                </td>--%>
                            </tr>
                        </itemtemplate>
                    </asp:repeater>    
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanZhuyishixiang.aspx.cs
@@ -40,7 +40,7 @@
                    OA_DeliverPlan oA_DeliverPlan = oA_DeliverPlanBLL.GetModelByKeyid(Request["Keyid"].ToGuid2(), Request["BuyerId"].ToGuid2(), Request["DeliverTime"].ToDateTime2());
                    if (oA_DeliverPlan != null)
                    {
                        this.txtZhuyishixiang.Value = oA_DeliverPlan.Zhuyishixiang ;
                        this.txtZhuyishixiang.Value = oA_DeliverPlan.Remark ;
                    }
                   
@@ -83,6 +83,7 @@
                    oA_DeliverPlan.BuyerId = BuyerId;
                    oA_DeliverPlan.DeliveredTime = null;
                    oA_DeliverPlan.Zhuyishixiang = Zhuyishixiang;
                    oA_DeliverPlan.Remark = Zhuyishixiang;
                    oA_DeliverPlan.Gongzuokaoping = "";
                    oA_DeliverPlan.CarId = 0;
                    oA_DeliverPlan.DriverId = 0;
@@ -99,6 +100,9 @@
                else
                {
                    oA_DeliverPlan.Zhuyishixiang = Zhuyishixiang;
                    oA_DeliverPlan.Remark = Zhuyishixiang;
                    oA_DeliverPlan.Updater = CurrentUser.TrueMemberId;
                    oA_DeliverPlan.LastUpdateTime = DateTime.Now;
                    result = oA_DeliverPlanBLL.UpdateModel(oA_DeliverPlan);
                }
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWork.aspx
@@ -44,7 +44,11 @@
<body>
    <form id="form1" runat="server" class="form">
         <table class="tableStyle">
            <tr><td class="ali03">订单编号:</td><td colspan="3"><%=Request["OrderShowId"] %></td></tr>
              <asp:Repeater ID="RepClientList" runat="server">
                <ItemTemplate>
            <tr><td class="ali03">订单编号:</td><td colspan="3"> <%#Eval("SellerOrderId")%></td></tr>
                     </ItemTemplate>
            </asp:Repeater>
            <tr><td class="ali03">送货状态:</td><td colspan="3"><asp:RadioButtonList ID="radDeliverType" runat="server" RepeatDirection="Horizontal"><asp:ListItem Value="-1" Text="未送货"></asp:ListItem><asp:ListItem Value="1" Text="已送货" Selected="True"></asp:ListItem></asp:RadioButtonList></td></tr>
             <tr><td class="ali03">货运单号:</td><td colspan="3"><asp:TextBox ID="txtTheAwb" runat="server"></asp:TextBox></td></tr>
            <tr><td class="ali03">送货人:</td><td colspan="3"><asp:TextBox ID="txtDeliverPerson" runat="server"></asp:TextBox></td></tr>
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWork.aspx.cs
@@ -17,20 +17,20 @@
        private EC_OrderBasicBLL _eC_OrderBasicBLL = new EC_OrderBasicBLL();
        private Sys_DictionaryBLL _bll_Sys_DictionaryBLL = new Sys_DictionaryBLL();
        private EC_AcceptWayByOrderBLL _AcceptWayByOrderBLL = new EC_AcceptWayByOrderBLL();
        public int orderId
        {
            get
            {
                if (Request["id"] != null)
                {
                    return Request["id"].ToString().ToInt32().Value;
                }
                else
                {
                    return 0;
                }
            }
        }
        //public int orderId
        //{
        //    get
        //    {
        //        if (Request["id"] != null)
        //        {
        //            return Request["id"].ToString().ToInt32().Value;
        //        }
        //        else
        //        {
        //            return 0;
        //        }
        //    }
        //}
        /// <summary>
        /// 绑定收货方式
@@ -50,9 +50,13 @@
            if (!IsPostBack)
            {
                BindAcceptType();
                if (orderId != 0)
                {
                    EC_AwbInfo model = _eC_OrderBasicBLL.SelectAwbInfoById(orderId);
                List<EC_OrderBasic> m_EC_OrderBasicList = _eC_OrderBasicBLL.GetEC_OrderBasicListByKeyid(Request["ids"].ToString2().Trim(','), CurrentUser.MemberId) as List<EC_OrderBasic>;
                this.RepClientList.DataSource = m_EC_OrderBasicList;
                this.RepClientList.DataBind();
                EC_AwbInfo model = _eC_OrderBasicBLL.SelectAwbInfoById(m_EC_OrderBasicList[0].Keyid.Value);
                    if (model != null)
                    {
                        this.txtTheAwb.Text = model.TheAwb;
@@ -86,7 +90,7 @@
                    else
                    {
                        this.txtDeliverTime.Text = DateTime.Now.ToShortDateString();
                        EC_AcceptWayByOrder acceptWayByOrder = _AcceptWayByOrderBLL.GetModelByTargetId(orderId);
                        EC_AcceptWayByOrder acceptWayByOrder = _AcceptWayByOrderBLL.GetModelByTargetId(m_EC_OrderBasicList[0].Keyid.Value);
                        if (acceptWayByOrder != null)
                        {
                            this.ddlAcceptType.SelectedValue = acceptWayByOrder.AcceptTypeId.ToString();
@@ -118,7 +122,7 @@
                            }
                        }
                    }
                }
            }
        }
@@ -127,76 +131,100 @@
        protected void btnSubmit_Click(object sender, EventArgs e)
        {
            bool isSuccess = false;
            EC_AwbInfo eC_AwbInfo = new EC_AwbInfo();
            eC_AwbInfo.Keyid = orderId;
            eC_AwbInfo.TheAwb = this.txtTheAwb.Text;
            eC_AwbInfo.DeliverPerson = this.txtDeliverPerson.Text;
            if (this.txtDeliverTime.Text != string.Empty)
                eC_AwbInfo.DeliverTime = this.txtDeliverTime.Text.ToDateTime2();
            string[] ids = Request["ids"].ToString2().Trim(',').Split(',');
            eC_AwbInfo.AcceptTypeId = ddlAcceptType.SelectedValue.ToString().ToInt32().Value;
            switch (eC_AwbInfo.AcceptTypeId)
            foreach (var item in ids)
            {
                case 104:
                    eC_AwbInfo.AppointCourierCompany = string.Empty;
                    eC_AwbInfo.FetchAddress = string.Empty;
                    eC_AwbInfo.FetchContacts = string.Empty;
                    eC_AwbInfo.FetchPhoneNum = string.Empty;
                    break;
                case 105:
                    eC_AwbInfo.AppointCourierCompany = this.txtAppointCourierCompany.Text;
                    eC_AwbInfo.FetchAddress = this.txtFetchAddress.Text;
                    eC_AwbInfo.FetchContacts = this.txtFetchContacts.Text;
                    eC_AwbInfo.FetchPhoneNum = this.txtFetchPhoneNum.Text;
                    break;
                case 106:
                    eC_AwbInfo.AppointCourierCompany = string.Empty;
                    eC_AwbInfo.FetchAddress = string.Empty;
                    eC_AwbInfo.FetchContacts = this.txtAcceptPerson.Text;
                    eC_AwbInfo.FetchPhoneNum = this.txtAcceptPhoneNum.Text;
                    break;
                case 107:
                    eC_AwbInfo.AppointCourierCompany = this.txtAppointCourierCompany.Text;
                    eC_AwbInfo.FetchAddress = this.txtFetchAddress.Text;
                    eC_AwbInfo.FetchContacts = this.txtFetchContacts.Text;
                    eC_AwbInfo.FetchPhoneNum = this.txtFetchPhoneNum.Text;
                    break;
                EC_AwbInfo eC_AwbInfo = new EC_AwbInfo();
                eC_AwbInfo.Keyid = item.ToInt32();
                eC_AwbInfo.TheAwb = this.txtTheAwb.Text;
                eC_AwbInfo.DeliverPerson = this.txtDeliverPerson.Text;
                if (this.txtDeliverTime.Text != string.Empty)
                    eC_AwbInfo.DeliverTime = this.txtDeliverTime.Text.ToDateTime2();
                eC_AwbInfo.AcceptTypeId = ddlAcceptType.SelectedValue.ToString().ToInt32().Value;
                switch (eC_AwbInfo.AcceptTypeId)
                {
                    case 104:
                        eC_AwbInfo.AppointCourierCompany = string.Empty;
                        eC_AwbInfo.FetchAddress = string.Empty;
                        eC_AwbInfo.FetchContacts = string.Empty;
                        eC_AwbInfo.FetchPhoneNum = string.Empty;
                        break;
                    case 105:
                        eC_AwbInfo.AppointCourierCompany = this.txtAppointCourierCompany.Text;
                        eC_AwbInfo.FetchAddress = this.txtFetchAddress.Text;
                        eC_AwbInfo.FetchContacts = this.txtFetchContacts.Text;
                        eC_AwbInfo.FetchPhoneNum = this.txtFetchPhoneNum.Text;
                        break;
                    case 106:
                        eC_AwbInfo.AppointCourierCompany = string.Empty;
                        eC_AwbInfo.FetchAddress = string.Empty;
                        eC_AwbInfo.FetchContacts = this.txtAcceptPerson.Text;
                        eC_AwbInfo.FetchPhoneNum = this.txtAcceptPhoneNum.Text;
                        break;
                    case 107:
                        eC_AwbInfo.AppointCourierCompany = this.txtAppointCourierCompany.Text;
                        eC_AwbInfo.FetchAddress = this.txtFetchAddress.Text;
                        eC_AwbInfo.FetchContacts = this.txtFetchContacts.Text;
                        eC_AwbInfo.FetchPhoneNum = this.txtFetchPhoneNum.Text;
                        break;
                }
                eC_AwbInfo.Remark = this.txtRemark.Text;
                eC_AwbInfo.Operate.OrderId = eC_AwbInfo.Keyid;
                eC_AwbInfo.Operate.Remark = eC_AwbInfo.Remark;
                eC_AwbInfo.Operate.Operator = CurrentUser.ShortName;
                //int orderState = Request["OrderState"].ToString().ToInt32().Value;
               var order = _eC_OrderBasicBLL.SelectModelById(item.ToInt32().Value);
                int orderState = order.OrderState.Value;
                if (orderState == -1)
                {
                    eC_AwbInfo.Operate.OperateType = -1;
                }
                else if (this.radDeliverType.SelectedValue == "1")
                {
                    eC_AwbInfo.Operate.OperateType = 5;
                }
                else
                {
                    eC_AwbInfo.Operate.OperateType = 4;
                }
                isSuccess = _eC_OrderBasicBLL.DeliverPresswork(eC_AwbInfo);
                if (isSuccess)
                {
                    EC_OrderBasic m_EC_OrderBasic_Out = _eC_OrderBasicBLL.SelectFromOutOrderById(eC_AwbInfo.Keyid.ToInt32() ?? 0);
                    if (m_EC_OrderBasic_Out != null)
                    {
                        EC_AwbInfo m_EC_AwbInfoOut = new EC_AwbInfo();
                        m_EC_AwbInfoOut = eC_AwbInfo;
                        m_EC_AwbInfoOut.Keyid = m_EC_OrderBasic_Out.Keyid;
                        m_EC_AwbInfoOut.Operate.OrderId = eC_AwbInfo.Keyid;
                        isSuccess = _eC_OrderBasicBLL.DeliverPresswork(m_EC_AwbInfoOut);
                        if (!isSuccess)
                        {
                            JavaScript.MessageBox("操作失败", this);
                        }
                    }
                }
                else
                {
                    JavaScript.MessageBox("操作失败", this);
                }
            }
            eC_AwbInfo.Remark = this.txtRemark.Text;
            eC_AwbInfo.Operate.OrderId = eC_AwbInfo.Keyid;
            eC_AwbInfo.Operate.Remark = eC_AwbInfo.Remark;
            eC_AwbInfo.Operate.Operator = CurrentUser.ShortName;
            int orderState = Request["OrderState"].ToString().ToInt32().Value;
            if (orderState == -1)
            {
                eC_AwbInfo.Operate.OperateType = -1;
            }
            else if (this.radDeliverType.SelectedValue == "1")
            {
                eC_AwbInfo.Operate.OperateType = 5;
            }
            else
            {
                eC_AwbInfo.Operate.OperateType = 4;
            }
            
            isSuccess = _eC_OrderBasicBLL.DeliverPresswork(eC_AwbInfo);
            if (isSuccess)
            {
                EC_OrderBasic m_EC_OrderBasic_Out = _eC_OrderBasicBLL.SelectFromOutOrderById(eC_AwbInfo.Keyid.ToInt32() ?? 0);
                if (m_EC_OrderBasic_Out != null)
                {
                    EC_AwbInfo m_EC_AwbInfoOut = new EC_AwbInfo();
                    m_EC_AwbInfoOut = eC_AwbInfo;
                    m_EC_AwbInfoOut.Keyid = m_EC_OrderBasic_Out.Keyid;
                    m_EC_AwbInfoOut.Operate.OrderId = eC_AwbInfo.Keyid;
                    isSuccess = _eC_OrderBasicBLL.DeliverPresswork(m_EC_AwbInfoOut);
                }
                JavaScript.MessageBox("操作成功", this,true,true);
                JavaScript.MessageBox("操作成功", this, true, true);
            }
            else
            {
                JavaScript.MessageBox("操作失败",this);
                JavaScript.MessageBox("操作失败", this);
            }
        }
    }
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWork.aspx.designer.cs
@@ -2,16 +2,18 @@
// <自动生成>
//     此代码由工具生成。
//
//     对此文件的更改可能会导致不正确的行为,并且如果
//     重新生成代码,这些更改将会丢失。
//     对此文件的更改可能导致不正确的行为,如果
//     重新生成代码,则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace CY.WebForm.Pages.business {
    public partial class DeliverWork {
namespace CY.WebForm.Pages.business
{
    public partial class DeliverWork
    {
        /// <summary>
        /// CMSHead1 控件。
        /// </summary>
@@ -20,7 +22,7 @@
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
        /// <summary>
        /// form1 控件。
        /// </summary>
@@ -29,7 +31,16 @@
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
        /// <summary>
        /// RepClientList 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.WebControls.Repeater RepClientList;
        /// <summary>
        /// radDeliverType 控件。
        /// </summary>
@@ -38,7 +49,7 @@
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.WebControls.RadioButtonList radDeliverType;
        /// <summary>
        /// txtTheAwb 控件。
        /// </summary>
@@ -47,7 +58,7 @@
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.WebControls.TextBox txtTheAwb;
        /// <summary>
        /// txtDeliverPerson 控件。
        /// </summary>
@@ -56,7 +67,7 @@
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.WebControls.TextBox txtDeliverPerson;
        /// <summary>
        /// txtDeliverTime 控件。
        /// </summary>
@@ -65,7 +76,7 @@
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.WebControls.TextBox txtDeliverTime;
        /// <summary>
        /// ddlAcceptType 控件。
        /// </summary>
@@ -74,7 +85,7 @@
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.WebControls.DropDownList ddlAcceptType;
        /// <summary>
        /// txtAppointCourierCompany 控件。
        /// </summary>
@@ -83,7 +94,7 @@
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.WebControls.TextBox txtAppointCourierCompany;
        /// <summary>
        /// txtFetchContacts 控件。
        /// </summary>
@@ -92,7 +103,7 @@
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.WebControls.TextBox txtFetchContacts;
        /// <summary>
        /// txtFetchAddress 控件。
        /// </summary>
@@ -101,7 +112,7 @@
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.WebControls.TextBox txtFetchAddress;
        /// <summary>
        /// txtFetchPhoneNum 控件。
        /// </summary>
@@ -110,7 +121,7 @@
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.WebControls.TextBox txtFetchPhoneNum;
        /// <summary>
        /// txtAcceptPerson 控件。
        /// </summary>
@@ -119,7 +130,7 @@
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.WebControls.TextBox txtAcceptPerson;
        /// <summary>
        /// txtAcceptPhoneNum 控件。
        /// </summary>
@@ -128,7 +139,7 @@
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.WebControls.TextBox txtAcceptPhoneNum;
        /// <summary>
        /// txtRemark 控件。
        /// </summary>
@@ -137,7 +148,7 @@
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.WebControls.TextBox txtRemark;
        /// <summary>
        /// btnSubmit 控件。
        /// </summary>
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
@@ -5,7 +5,7 @@
<head id="Head1" runat="server">
    <title>订单列表</title>
    <uc:cmshead id="CMSHead1" runat="server" />
    <script src="../../js/business/Order.js?v=7" type="text/javascript"></script>
    <script src="../../js/business/Order.js?v=8" type="text/javascript"></script>
    <script type="text/javascript">
        //订单评价
        function evaluationModel(orderid) {
@@ -50,7 +50,7 @@
        
        function DeliverWork(orderId, orderCode, orderState) {
            var url = "/Pages/business/DeliverWork.aspx?id=" + orderId;
            var url = "/Pages/business/DeliverWork.aspx?ids=" + orderId;
            url += "&OrderShowId=" + orderCode;
            url += "&OrderState=" + orderState;
            top.Dialog.open({ URL: url, Title: "送货", Height: 450, Width: 680 });
@@ -371,6 +371,9 @@
                            <a href="javascript:;" menu_member_case_id="case_ToCompledList" menu_member_case_name="批量完工" onclick="ToCompled();"><span class="icon_edit">批量完工</span></a>
                            <div class="box_tool_line">
                            </div>
                             <a href="javascript:;" menu_member_case_id="case_ToSonghuoList" menu_member_case_name="批量送货" onclick="ToDeliverWork();"><span class="icon_edit">批量送货</span></a>
                            <div class="box_tool_line">
                            </div>
                            <a href="javascript:;" menu_member_case_id="case_ToPrintAwbOrder" menu_member_case_name="打印送货单" onclick="ToPrintAwbOrder()"><span class="icon_edit">打印送货单</span></a>
                            <%-- <div class="box_tool_line">
                            </div>
@@ -589,11 +592,11 @@
                                </td>
                                <td class="td_hide" menu_member_case_id="case_CompledWork" menu_member_case_name="完工">
                                    <span class="<%#IsCanOpearte(Eval("Keyid"),Eval("OrderState"),Eval("OutId"),"完工")?"hand_yes":"hand_no"%>" <%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "完工")?"title='已完工'":"title='完工'"%> style='display: ' onclick="CompledWork(<%#Eval("Keyid")%>)">
                                        <%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "完工") ? "√" : "完工"%></span>
                                        <%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "完工") ? "√" : Eval("Shifoubiaohongwangong")%></span>
                                </td>
                                <td class="td_hide" menu_member_case_id="case_DeliverWork" menu_member_case_name="送货">
                                    <span class="<%#IsCanOpearte(Eval("Keyid"),Eval("OrderState"),Eval("OutId"),"送货")?"hand_yes":"hand_no"%>" <%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "送货")?"title='已送货'":"title='送货'"%> style='display: ' onclick='DeliverWork(<%#Eval("Keyid")%>,"<%#Eval("SellerOrderId")%>","<%#Eval("OrderState")%>")'>
                                        <%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "送货") ? "√" : "送货"%></span>
                                        <%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "送货") ? "√" : Eval("Shifoubiaohongsonghuo")%></span>
                                </td>
                                <td class="td_hide" menu_member_case_id="case_ShowDoDelay" menu_member_case_name="撤单">
                                    <span class="<%#IsCanOpearte(Eval("Keyid"),Eval("OrderState"),Eval("OutId"),"撤单")?"hand_yes":"hand_no"%>" <%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "撤单")?"title='已撤单'":"title='撤单'"%> style='display: ' onclick="ShowDoDelay({dtypeId:4,defaultarget:'<%#Eval("TradingSingle.PayedMoney", "{0:F}")%>',orderid:<%#Eval("Keyid")%>,orderShowId:'<%#Eval("SellerOrderId")%>',receiver:'<%#Eval("BuyerId")%>',orderState:'<%#Eval("OrderState")%>',orderType:'<%#Eval("OrderTypeId")%>',title:'撤单管理' })">
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.cs
@@ -674,6 +674,20 @@
                PageIndex = UCPager1.AspNetPager.CurrentPageIndex
            };
            IEnumerable<EC_OrderBasic> result = _eC_OrderBasicBLL.SelectModelPage_Seller(pagination, SearchParam);
            foreach (var eC_OrderBasic in result)
            {
                if(eC_OrderBasic.DeliveryTime.HasValue && eC_OrderBasic.DeliveryTime.Value < DateTime.Now.Date)
                {
                    eC_OrderBasic.Shifoubiaohongwangong = "<p style=\"color:red;\">完工</p>";
                    eC_OrderBasic.Shifoubiaohongsonghuo = "<p style=\"color:red;\">送货</p>";
                }
                else
                {
                    eC_OrderBasic.Shifoubiaohongwangong = "完工";
                    eC_OrderBasic.Shifoubiaohongsonghuo = "送货";
                }
            }
            rptData.DataSource = result;
            rptData.DataBind();
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderSonghuoanchiList.aspx
New file
@@ -0,0 +1,203 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="OrderSonghuoanchiList.aspx.cs" Inherits="CY.WebForm.Pages.business.OrderSonghuoanchiList" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head id="Head1" runat="server">
    <title>订单列表</title>
    <uc:cmshead id="CMSHead1" runat="server" />
    <script src="../../js/business/Order.js" type="text/javascript"></script>
    <script type="text/javascript">
        //查看客户资料
        function View(Keyid, DelayTime) {
            top.Dialog.open({ URL: "/Pages/business/OrderDelayTimeEdit.aspx?Keyid=" + Keyid + "&DelayTime=" + DelayTime, Title: "延迟送货时间", Width: 300, Height: 300 });
        }
        //后道外协
        function outAfterWorks(works, Keyid, SellerOrderId) {
            top.Dialog.open({ URL: "/Pages/business/OrderProductionprogress.aspx?SellerOrderId=" + SellerOrderId + "&Keyid=" + Keyid + "&works=" + works, Title: works, Width: 300, Height: 300 });
        }
    </script>
    <style type="text/css">
        .tableStyleXS th { padding: 1px 0 1px 3px; background-image:none; border-bottom:1px solid #CCC; }
        .tableStyleXS td { padding: 1px 0 1px 3px; }
        .TableNewStyle select { width: 80px; }
        .td_hide span { text-decoration: default; display: none; text-align: center; }
        span.hand_no { cursor: default; display: block; font-size: 12px; }
        span.hand_no:hover { text-decoration: none; }
        span.hand_yes { cursor: pointer; display: block; font-size: 12px; }
        .td_hide { cursor: pointer; }
    </style>
</head>
<body>
     <form id="form1" runat="server">
    <div id="scrollContent" style="width: auto;">
        <div class="box1">
            <table class="TableNewStyle" style="width: 100%;">
                <tr>
                    <td class="ali03">
                        交货时间:
                    </td>
                    <td colspan="11">
                      <%--  <select keepdefaultstyle='true' id='selDeliveryTime' runat="server" datatextfield="Name" datavaluefield="MeanValue">
                             <option value ="">全部</option>
                            <option value ="明天" selected="selected"> </option>
                             <option value ="后天"> </option>
                             <option value ="3天"> </option>
                             <option value ="4天"> </option>
                             <option value ="5天"> </option>
                             <option value ="6天"> </option>
                             <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="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;
                        <asp:button id="Button4" text="日期" runat="server"  padding="0px" OnClick="btn_Search_Click4" />&nbsp;&nbsp;
                        <asp:button id="Button5" text="日期" runat="server"  padding="0px" OnClick="btn_Search_Click5" />&nbsp;&nbsp;
                        <asp:button id="Button6" text="日期" runat="server"  padding="0px" OnClick="btn_Search_Click6" />&nbsp;&nbsp;
                        <asp:button id="Button7" text="日期" runat="server"  padding="0px" OnClick="btn_Search_Click7" />&nbsp;&nbsp;
                         <asp:button id="Button8" text="日期" runat="server"  padding="0px" OnClick="btn_Search_Click8" Width="60px"  />
                        <input type="hidden" runat="server" id="txtDeliveryTime"  />
                    </td>
                </tr>
                <tr>
                     <td class="ali03">
                        所在区域:
                    </td>
                    <td>
                        <asp:DropDownList ID="selectProvince" runat="server" keepDefaultStyle="true" AutoPostBack="true" OnSelectedIndexChanged="ChangeProvince" Width="70px">
                        </asp:DropDownList>
                        <asp:DropDownList ID="selectCity" runat="server" keepDefaultStyle="true" AutoPostBack="true" OnSelectedIndexChanged="ChangeCity" Width="70px">
                        </asp:DropDownList>
                        <asp:DropDownList ID="selectCounty" runat="server" keepDefaultStyle="true" AutoPostBack="false" Width="70px">
                        </asp:DropDownList>
                    </td>
                    <td class="ali03">
                        客户单位:
                    </td>
                    <td>
                        <input id='txtCustormerName' runat="server" maxlength='50' />
                    </td>
                    <td class="ali03">
                        业务经理:
                    </td>
                    <td>
                        <select keepdefaultstyle='true' id='selBusinessManager' runat="server" datatextfield='Name' datavaluefield='Keyid'>
                        </select>
                    </td>
                     <td class="ali03">
                        订单编号:
                    </td>
                    <td>
                        <input id='txtSellerOrderId' runat="server" maxlength='25' />
                    </td>
                      <td class="ali03">
                        印件名称:
                    </td>
                    <td>
                        <input id='txtDocumentName' runat="server" maxlength='25' />
                    </td>
                    <td>
                    </td>
                    <td>
                        <asp:button id="btn_Search" text="查询" runat="server"  padding="0px" OnClick="btn_Search_Click" />&nbsp;<input type="button" value='重置' onclick='document.body.innerHTML="";window.location=window.location;' />
                    </td>
                </tr>
            </table>
        </div>
        <div clear="fl">
            <table class="tableStyle tableStyleXS" useclick="false" usecheckbox="true" sortmode="false">
                <thead>
                    <tr>
                        <th width="25">
                            序号
                        </th>
                        <th style="text-align: center;" width="50">
                            业务经理
                        </th>
                        <th style="text-align: center;"width="70">
                            客户单位
                        </th>
                        <th width="70">
                            订单号
                        </th>
                        <th width="250">
                            印件名称
                        </th>
                        <th style="text-align: center;"width="50">
                            数量
                        </th>
                        <th width="50">
                            金额
                        </th>
                        <th width="50">
                            交货时间
                        </th>
                         <th width="50">
                            延迟送货时间
                        </th>
                    </tr>
                </thead>
                <tbody>
                    <asp:repeater id="RepClientList" runat="server">
                        <itemtemplate>
                            <tr>
                                <td>
                                    <%#Container.ItemIndex + (UCPager1.PageSize *( UCPager1.PageIndex-1)+1)%>
                                </td>
                                <td>
                                    <%#Eval("BusinessManager ")%>
                                </td>
                                <td>
                                    <%#Eval("BuyerName")%>
                                </td>
                                <td>
                                    <%#Eval("SellerOrderId")%>
                                </td>
                                 <td>
                                    <%#Eval("DocumentName")%>
                                </td>
                                <td>
                                    <%#Eval("OrderExtend.PrintNum")%>
                                </td>
                                <td>
                                    <%#Eval("SumPrice", "{0:F}")%>
                                </td>
                                 <td>
                                      <%#Eval("DeliveryTime", "{0:yyyy-MM-dd}")%>
                                </td>
                                <td>
                                    <a href='javascript:void(0)' title='点击修改延迟日期' class='a_under' onclick='View("<%#Eval("Keyid")%>","<%#Eval("DelayTime", "{0:yyyy-MM-dd}")%>")'> <%#Eval("DelayTime")==null?"修改延迟":Eval("DelayTime", "{0:yyyy-MM-dd}")%>    </a>
                                </td>
                            </tr>
                        </itemtemplate>
                    </asp:repeater>
                </tbody>
            </table>
            <uc:ucpager id="UCPager1" runat="server" />
        </div>
    </div>
    </form>
</body>
</html>
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderSonghuoanchiList.aspx.cs
New file
@@ -0,0 +1,357 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using CY.BLL;
using CY.Model;
using CY.Infrastructure.Query;
using CY.Infrastructure.Common;
using CY.BLL.Sys;
using CY.BLL.OA;
using CY.BLL.EC;
using CY.BLL.Inquiry;
using CY.Model.Inquiry;
using System.Drawing;
namespace CY.WebForm.Pages.business
{
    public partial class OrderSonghuoanchiList : BasePage
    {
        Sys_CitySiteBLL bll_Sys_CitySiteBLL = null;
        EC_OrderBasicBLL _eC_OrderBasicBLL = null;
        OA_StaffBLL bll_OA_StaffBLL = null;
        AfterParameterInfoBLL _afterParameterInfoBLL = null;
        //初始化
        public OrderSonghuoanchiList()
        {
            bll_Sys_CitySiteBLL = new Sys_CitySiteBLL();
            _eC_OrderBasicBLL = new EC_OrderBasicBLL();
            bll_OA_StaffBLL = new OA_StaffBLL();
            _afterParameterInfoBLL = new AfterParameterInfoBLL();
        }
        protected void Page_Load(object sender, EventArgs e)
        {
            UCPager1.AspNetPager.PageChanged += AspNetPager1_PageChanged;
            if (!IsPostBack)
            {
                BindProvince();
                InitialSelectData();
                BindList();
            }
        }
        //绑定省
        protected void BindProvince()
        {
            this.selectProvince.Items.Clear();
            if (CurrentUser.TrueType == "员工")
                this.selectProvince.DataSource = bll_Sys_CitySiteBLL.SelectStaffManageProvinceList(CurrentUser.TrueMemberId);
            else
                this.selectProvince.DataSource = bll_Sys_CitySiteBLL.SelectAllNextModel(0, 0, 1);
            this.selectProvince.DataTextField = "Name";
            this.selectProvince.DataValueField = "Keyid";
            this.selectProvince.DataBind();
            this.selectProvince.Items.Insert(0, new ListItem("全部", ""));
            this.selectCity.Items.Insert(0, new ListItem("全部", ""));
            this.selectCounty.Items.Insert(0, new ListItem("全部", ""));
        }
        //改变省绑定市
        protected void ChangeProvince(object sender, EventArgs e)
        {
            this.selectCity.Items.Clear();
            this.selectCounty.Items.Clear();
            Sys_CitySite m_Sys_CitySite = bll_Sys_CitySiteBLL.GetModelByKeyid(this.selectProvince.SelectedValue.ToInt32() ?? 0);
            if (m_Sys_CitySite != null)
            {
                if (CurrentUser.TrueType == "员工")
                    this.selectCity.DataSource = bll_Sys_CitySiteBLL.SelectStaffManageCityList(m_Sys_CitySite.Keyid, CurrentUser.TrueMemberId);
                else
                    this.selectCity.DataSource = bll_Sys_CitySiteBLL.SelectAllNextModel(m_Sys_CitySite.Keyid, 0, 2);
                this.selectCity.DataTextField = "Name";
                this.selectCity.DataValueField = "Keyid";
                this.selectCity.DataBind();
            }
            this.selectCity.Items.Insert(0, new ListItem("全部", ""));
            this.selectCounty.Items.Insert(0, new ListItem("全部", ""));
        }
        //改变市绑定区
        protected void ChangeCity(object sender, EventArgs e)
        {
            this.selectCounty.Items.Clear();
            Sys_CitySite m_Sys_CitySite = bll_Sys_CitySiteBLL.GetModelByKeyid(this.selectCity.SelectedValue.ToInt32() ?? 0);
            if (m_Sys_CitySite != null)
            {
                if (CurrentUser.TrueType == "员工")
                    this.selectCounty.DataSource = bll_Sys_CitySiteBLL.SelectStaffManageCountryList(m_Sys_CitySite.ProvinceId, m_Sys_CitySite.Keyid, CurrentUser.TrueMemberId);
                else
                    this.selectCounty.DataSource = bll_Sys_CitySiteBLL.SelectProxyNextModel(m_Sys_CitySite.ProvinceId, m_Sys_CitySite.Keyid, 3);
                this.selectCounty.DataTextField = "Name";
                this.selectCounty.DataValueField = "Keyid";
                this.selectCounty.DataBind();
            }
            this.selectCounty.Items.Insert(0, new ListItem("全部", ""));
        }
        //分页事件
        protected void AspNetPager1_PageChanged(object src, EventArgs e)
        {
            BindList();
        }
        //查询事件
        protected void btn_Search_Click(object sender, EventArgs e)
        {
            BindList();
        }
        protected void btn_Search_Click1(object sender, EventArgs e)
        {
            this.txtDeliveryTime.Value = this.Button1.Text;
            BindList();
        }
        protected void btn_Search_Click0(object sender, EventArgs e)
        {
            this.txtDeliveryTime.Value = this.Button0.Text;
            BindList();
        }
        protected void btn_Search_Click2(object sender, EventArgs e)
        {
            this.txtDeliveryTime.Value = this.Button2.Text;
            BindList();
        }
        protected void btn_Search_Click3(object sender, EventArgs e)
        {
            this.txtDeliveryTime.Value = this.Button3.Text;
            BindList();
        }
        protected void btn_Search_Click4(object sender, EventArgs e)
        {
            this.txtDeliveryTime.Value = this.Button4.Text;
            BindList();
        }
        protected void btn_Search_Click5(object sender, EventArgs e)
        {
            this.txtDeliveryTime.Value = this.Button5.Text;
            BindList();
        }
        protected void btn_Search_Click6(object sender, EventArgs e)
        {
            this.txtDeliveryTime.Value = this.Button6.Text;
            BindList();
        }
        protected void btn_Search_Click7(object sender, EventArgs e)
        {
            this.txtDeliveryTime.Value = this.Button7.Text;
            BindList();
        }
        protected void btn_Search_Click8(object sender, EventArgs e)
        {
            this.txtDeliveryTime.Value = this.Button8.Text;
            BindList();
        }
        //加载查询条件
        protected void InitialSelectData()
        {
            this.selBusinessManager.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, true, false);
            this.selBusinessManager.DataTextField = "Name";
            this.selBusinessManager.DataValueField = "Keyid";
            this.selBusinessManager.DataBind();
            this.selBusinessManager.Items.Insert(0, new ListItem("全部", ""));
            this.Button0.Text = "逾期";
            this.Button1.Text = "明天";
            this.Button2.Text = "后天";
            this.Button3.Text = "3天";
            this.Button4.Text = "4天";
            this.Button5.Text = "5天";
            this.Button6.Text = "6天";
            this.Button7.Text = "7天";
            this.Button8.Text = "一周后";
        }
        //绑定列表
        private void BindList()
        {
            if (this.txtDeliveryTime.Value == "")
            {
                this.txtDeliveryTime.Value = this.Button1.Text;
            }
            if (this.txtDeliveryTime.Value == this.Button1.Text)
            {
                this.Button1.BorderColor = Color.Black;
                this.Button2.BorderColor = Color.LightBlue;
                this.Button3.BorderColor = Color.LightBlue;
                this.Button4.BorderColor = Color.LightBlue;
                this.Button5.BorderColor = Color.LightBlue;
                this.Button6.BorderColor = Color.LightBlue;
                this.Button7.BorderColor = Color.LightBlue;
                this.Button8.BorderColor = Color.LightBlue;
                this.Button0.BorderColor = Color.LightBlue;
            }
            else if (this.txtDeliveryTime.Value == this.Button2.Text)
            {
                this.Button2.BorderColor = Color.Black;
                this.Button1.BorderColor = Color.LightBlue;
                this.Button3.BorderColor = Color.LightBlue;
                this.Button4.BorderColor = Color.LightBlue;
                this.Button5.BorderColor = Color.LightBlue;
                this.Button6.BorderColor = Color.LightBlue;
                this.Button7.BorderColor = Color.LightBlue;
                this.Button8.BorderColor = Color.LightBlue;
                this.Button0.BorderColor = Color.LightBlue;
            }
            else if (this.txtDeliveryTime.Value == this.Button3.Text)
            {
                this.Button3.BorderColor = Color.Black;
                this.Button2.BorderColor = Color.LightBlue;
                this.Button1.BorderColor = Color.LightBlue;
                this.Button4.BorderColor = Color.LightBlue;
                this.Button5.BorderColor = Color.LightBlue;
                this.Button6.BorderColor = Color.LightBlue;
                this.Button7.BorderColor = Color.LightBlue;
                this.Button8.BorderColor = Color.LightBlue;
                this.Button0.BorderColor = Color.LightBlue;
            }
            else if (this.txtDeliveryTime.Value == this.Button4.Text)
            {
                this.Button4.BorderColor = Color.Black;
                this.Button2.BorderColor = Color.LightBlue;
                this.Button3.BorderColor = Color.LightBlue;
                this.Button1.BorderColor = Color.LightBlue;
                this.Button5.BorderColor = Color.LightBlue;
                this.Button6.BorderColor = Color.LightBlue;
                this.Button7.BorderColor = Color.LightBlue;
                this.Button8.BorderColor = Color.LightBlue;
                this.Button0.BorderColor = Color.LightBlue;
            }
            else if (this.txtDeliveryTime.Value == this.Button5.Text)
            {
                this.Button5.BorderColor = Color.Black;
                this.Button2.BorderColor = Color.LightBlue;
                this.Button3.BorderColor = Color.LightBlue;
                this.Button4.BorderColor = Color.LightBlue;
                this.Button1.BorderColor = Color.LightBlue;
                this.Button6.BorderColor = Color.LightBlue;
                this.Button7.BorderColor = Color.LightBlue;
                this.Button8.BorderColor = Color.LightBlue;
                this.Button0.BorderColor = Color.LightBlue;
            }
            else if (this.txtDeliveryTime.Value == this.Button6.Text)
            {
                this.Button6.BorderColor = Color.Black;
                this.Button2.BorderColor = Color.LightBlue;
                this.Button3.BorderColor = Color.LightBlue;
                this.Button4.BorderColor = Color.LightBlue;
                this.Button5.BorderColor = Color.LightBlue;
                this.Button1.BorderColor = Color.LightBlue;
                this.Button7.BorderColor = Color.LightBlue;
                this.Button8.BorderColor = Color.LightBlue;
                this.Button0.BorderColor = Color.LightBlue;
            }
            else if (this.txtDeliveryTime.Value == this.Button7.Text)
            {
                this.Button7.BorderColor = Color.Black;
                this.Button2.BorderColor = Color.LightBlue;
                this.Button3.BorderColor = Color.LightBlue;
                this.Button4.BorderColor = Color.LightBlue;
                this.Button5.BorderColor = Color.LightBlue;
                this.Button6.BorderColor = Color.LightBlue;
                this.Button1.BorderColor = Color.LightBlue;
                this.Button8.BorderColor = Color.LightBlue;
                this.Button0.BorderColor = Color.LightBlue;
            }
            else if (this.txtDeliveryTime.Value == this.Button8.Text)
            {
                this.Button8.BorderColor = Color.Black;
                this.Button2.BorderColor = Color.LightBlue;
                this.Button3.BorderColor = Color.LightBlue;
                this.Button4.BorderColor = Color.LightBlue;
                this.Button5.BorderColor = Color.LightBlue;
                this.Button6.BorderColor = Color.LightBlue;
                this.Button1.BorderColor = Color.LightBlue;
                this.Button7.BorderColor = Color.LightBlue;
                this.Button0.BorderColor = Color.LightBlue;
            }
            else if (this.txtDeliveryTime.Value == this.Button0.Text)
            {
                this.Button0.BorderColor = Color.Black;
                this.Button2.BorderColor = Color.LightBlue;
                this.Button3.BorderColor = Color.LightBlue;
                this.Button4.BorderColor = Color.LightBlue;
                this.Button5.BorderColor = Color.LightBlue;
                this.Button6.BorderColor = Color.LightBlue;
                this.Button1.BorderColor = Color.LightBlue;
                this.Button7.BorderColor = Color.LightBlue;
                this.Button8.BorderColor = Color.LightBlue;
            }
            DateTime? beginTime = null;
            DateTime? endTime = null;
            Pagination pa = new Pagination();
            pa.PageSize = UCPager1.AspNetPager.PageSize;
            pa.PageIndex = UCPager1.AspNetPager.CurrentPageIndex;
            IEnumerable < EC_OrderBasic > eC_OrderBasics = _eC_OrderBasicBLL.GetModelPageListForSonghuoyanchis(pa,
                this.txtDeliveryTime.Value,
                 this.selectProvince.SelectedItem.Text.Replace("全部", ""),
                this.selectCity.SelectedItem.Text.Replace("全部", ""),
                this.selectCounty.SelectedItem.Text.Replace("全部", ""),
                 this.txtCustormerName.Value,
                this.selBusinessManager.Value,
                this.txtSellerOrderId.Value,
                 this.txtDocumentName.Value,
                 CurrentUser.MemberId);
            IList<SysInquiry_AfterParameterInfo> afterInfos = _afterParameterInfoBLL.GetModelList();
            this.RepClientList.DataSource = eC_OrderBasics;
            this.RepClientList.DataBind();
            UCPager1.AspNetPager.RecordCount = pa.RecordCount;
        }
    }
}
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderSonghuoanchiList.aspx.designer.cs
New file
@@ -0,0 +1,224 @@
//------------------------------------------------------------------------------
// <自动生成>
//     此代码由工具生成。
//
//     对此文件的更改可能导致不正确的行为,如果
//     重新生成代码,则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace CY.WebForm.Pages.business
{
    public partial class OrderSonghuoanchiList
    {
        /// <summary>
        /// Head1 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
        /// <summary>
        /// CMSHead1 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
        /// <summary>
        /// form1 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
        /// <summary>
        /// Button0 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.WebControls.Button Button0;
        /// <summary>
        /// Button1 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.WebControls.Button Button1;
        /// <summary>
        /// Button2 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.WebControls.Button Button2;
        /// <summary>
        /// Button3 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.WebControls.Button Button3;
        /// <summary>
        /// Button4 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.WebControls.Button Button4;
        /// <summary>
        /// Button5 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.WebControls.Button Button5;
        /// <summary>
        /// Button6 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.WebControls.Button Button6;
        /// <summary>
        /// Button7 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.WebControls.Button Button7;
        /// <summary>
        /// Button8 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.WebControls.Button Button8;
        /// <summary>
        /// txtDeliveryTime 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlInputHidden txtDeliveryTime;
        /// <summary>
        /// selectProvince 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.WebControls.DropDownList selectProvince;
        /// <summary>
        /// selectCity 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.WebControls.DropDownList selectCity;
        /// <summary>
        /// selectCounty 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.WebControls.DropDownList selectCounty;
        /// <summary>
        /// txtCustormerName 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlInputText txtCustormerName;
        /// <summary>
        /// selBusinessManager 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlSelect selBusinessManager;
        /// <summary>
        /// txtSellerOrderId 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlInputText txtSellerOrderId;
        /// <summary>
        /// txtDocumentName 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlInputText txtDocumentName;
        /// <summary>
        /// btn_Search 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.WebControls.Button btn_Search;
        /// <summary>
        /// RepClientList 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.WebControls.Repeater RepClientList;
        /// <summary>
        /// UCPager1 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::CY.WebForm.Pages.common.UCPager UCPager1;
    }
}
CY_ECommercePlatform/CY.WebForm/js/business/Order.js
@@ -276,6 +276,38 @@
    }
}
/*
批量完工
*/
function ToDeliverWork(operateFn, validateFn) {
    var ids = '';
    var cks = $("input[name='ckId']:checked");
    if (cks.length == 0) { alertMsg('没有选中任何项!'); return; } else { }
    var isCan = true;
    cks.each(function (ii, vv) {
        var ckVal = $(this).val();
        var ckValJson = eval('(' + ckVal + ')');
        //        if (parseInt(ckValJson.orderType) < 1 && ckValJson.orderState == 1) {
        //            isCan = false;
        //            return false;
        //        }
        if (ckValJson.orderState == 1 || ckValJson.orderState <= 0) {
            isCan = false;
            return false;
        }
        ids = ids + ',' + $(vv).attr("value_keyid");
    });
    if (isCan) {
        dialog.open({ URL: "/Pages/business/DeliverWork.aspx?ids=" + ids, Title: '完工', Height: 600, Width: 680 });
    }
    else {
        alertMsg("所选订单未受理,或已冻结,或者已终止,或已完成,不能操作完工!");
    }
}
function SendToServer(sparam) {
    CallServer(sparam, function (data, textStatus) {