送货计划增加“完成情况：全部、已送、未送”查询条件，默认“未送”

username@email.com

4 小时以前 c50c286df3108ce4a48674f15f29954fb3e4cb7f

送货计划增加“完成情况：全部、已送、未送”查询条件，默认“未送”

送货计划已送不是在送货情况里面？

只要在小程序中点了该学校的送货完成后，“送货计划”默认的列表里就不再显示该学校，没有在小程序中点完成送货操作的，该学校一直显示在“送货计划”的默认列表中

“送货计划”默认列表的判断逻辑是该次送货安排是否在小程序中进行了操作，而不是这个学校的送全部送完

 CY_ECommercePlatform/CY.BLL/OA/CoreDeliverOrderBLL.cs

@@ -164,9 +164,28 @@
        /// <param name="pa"></param>
        /// <returns></returns>
        public IEnumerable<CoreDeliverOrder> SelectModelPage(Pagination pa, Guid FirmId, int? DriverId, string shipAddress,
            string BuyerName, string createTimeStart, string createTimeEnd)
            string BuyerName, string createTimeStart, string createTimeEnd, string OrderState)
        {
            string Condition = " and b.FirmId ='" + FirmId + "' and a.OrderState = 0 ";
            string Condition = " and b.FirmId ='" + FirmId + "' and b.DeliverState != 2 ";

            if (!string.IsNullOrEmpty(OrderState))
            {
                if (OrderState != "4")
                {
                    Condition += " and  a.OrderState = " + OrderState + " ";
                }
                else
                {
                    Condition += " and a.OrderState  in( 0,1 ) ";
                }
            }
            else
            {
                Condition += " and a.OrderState  in( 0,1,2 ) ";


            }

            if (DriverId.HasValue)
            {
               var oA_Staff  = staffBLL.GetModelByKeyid(DriverId);

 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx

@@ -130,7 +130,17 @@
                    <td>
                        <input id='txtXuexiao' runat="server" maxlength='50' />
                    </td>
                 
                  <td class="ali03"  >
                        送货状态：
                    </td>
                    <td   >
                        <select keepdefaultstyle='true' id='selOrderState' runat="server" >
                            <option value="">请选择</option>
                             <option value="4"  selected="selected" >未送</option>
                          
                            <option value="2"  >已送</option>
                        </select>
                    </td>
                     
                    <td  >
                        <asp:Button ID="btn_Search" Text="查询" runat="server" OnClick="btn_Search_Click" />&nbsp;<input type="button" value='重置' onclick='document.body.innerHTML="";window.location=window.location;' />
@@ -161,6 +171,9 @@
                            </th>
                            <th style="text-align: center">
                                司机
                            </th>
                            <th style="text-align: center">
                                送货状态
                            </th>
                             <%=biaotou %>
                             
@@ -193,11 +206,14 @@
                        <td style="text-align: center">
                         <%#Eval("DriverName")%>
                        </td>
                         <%#Eval("biaoge")%>
                        <td class="Operate " style="text-align: center">
                        <td style="text-align: center">
                         <%#Eval("OrderStateName")%>
                        </td>
                         <%#Eval("biaoge")%> 
                        <td class="Operate " style="text-align: center;white-space: nowrap;">
                            <span    onclick="onViewCarInsurance('<%#Eval("id")%>')">查看明细</span>
                            <span menu_member_case_id="case_onEdit" menu_member_case_name="修改"    onclick="onEdit('<%#Eval("id")%>')">修改</span>
                             <span menu_member_case_id="case_onDele" menu_member_case_name="撤销"    onclick="onDele('<%#Eval("id")%>')">撤销</span>
                            <span menu_member_case_id="case_onEdit" menu_member_case_name="修改"  style="<%#Eval("OrderState").ToString()!="0"?"display:none;":"" %>"   onclick="onEdit('<%#Eval("id")%>')">修改</span>
                             <span menu_member_case_id="case_onDele" menu_member_case_name="撤销"  style="<%#Eval("OrderState").ToString()!="0"?"display:none;":"" %>"  onclick="onDele('<%#Eval("id")%>')">撤销</span>

                             
                           

 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx.cs

@@ -91,7 +91,7 @@
            pa.PageSize = 500;
            pa.PageIndex = 1;

            var coreDeliverOrders = _CoreDeliverOrderBLL.SelectModelPage(pa, CurrentUser.MemberId, this.selDriver.Value.ToInt32(),this.txtXuexiao.Value.Trim(),this.selBuyerName.Value.Trim(), this.txtBeginDate.Value.Trim(), this.txtEndDate.Value.Trim()); ;
            var coreDeliverOrders = _CoreDeliverOrderBLL.SelectModelPage(pa, CurrentUser.MemberId, this.selDriver.Value.ToInt32(),this.txtXuexiao.Value.Trim(),this.selBuyerName.Value.Trim(), this.txtBeginDate.Value.Trim(), this.txtEndDate.Value.Trim(), this.selOrderState.Value); ;
            EC_OrderPrintParameter _eC_OrderPrintParameter = _eC_OrderPrintParameterBLL.GetModel(this.selBuyerName.Value.Trim().ToInt32().Value);
            InquiryCommonModel _inquiryCommonModel = null;
            if (null == _eC_OrderPrintParameter)
@@ -107,7 +107,7 @@

            if (string.IsNullOrEmpty(biaotou))
            {
                string biaotou2 = "<th style=\"text-align:center\" >  </th> <th style=\"text-align:center\" >  </th><th style=\"text-align:center\" >  </th> <th style=\"text-align:center\" >  </th> <th style=\"text-align:center\" >  </th>";
                string biaotou2 = "<th style=\"text-align:center\" >  </th><th style=\"text-align:center\" >  </th> <th style=\"text-align:center\" >  </th><th style=\"text-align:center\" >  </th> <th style=\"text-align:center\" >  </th> <th style=\"text-align:center\" >  </th>";
                foreach (var inquiryWorkBookModel in inquiryWorkBookModels)
                {
                    biaotou += " <th style=\"text-align:center\"  > " + inquiryWorkBookModel.WorkBookSizeTxt + inquiryWorkBookModel.WorkBookNameTxt + " </th> ";
@@ -206,7 +206,7 @@
            }


            biaowei = " <td></td>  <td></td> <td style=\"text-align:center\">  </td> <td style=\"color: grey;text-align: center;\" > " + coreDeliverOrders.Count() + " </td><td style=\"text-align:center\">  </td> ";
            biaowei = " <td></td><td></td>  <td></td> <td style=\"text-align:center\">  </td> <td style=\"color: grey;text-align: center;\" > " + coreDeliverOrders.Count() + " </td><td style=\"text-align:center\">  </td> ";
            foreach (var inquiryWorkBookModel in inquiryWorkBookModels)
            {
                var nums = cmsPlanOrderItems.Where(x => x.name == inquiryWorkBookModel.WorkBookNameTxt && x.specification == inquiryWorkBookModel.WorkBookSizeTxt && ids.Contains(x.orderId)).Sum(x => x.nums);

 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx.designer.cs

@@ -87,6 +87,15 @@
        protected global::System.Web.UI.HtmlControls.HtmlInputText txtXuexiao;

        /// <summary>
        /// selOrderState 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlSelect selOrderState;

        /// <summary>
        /// btn_Search 控件。
        /// </summary>
        /// <remarks>