CY_ECommercePlatform/CY.Model/OA/CoreDeliverOrderItem.cs

@@ -68,7 +68,17 @@
        /// 送货时间
        /// </summary>
        public System.DateTime? MakeTime { get; set; }
        

        /// <summary>
        /// 送货时间
        /// </summary>
        public System.DateTime? StartTime { get; set; }

        /// <summary>
        /// 送货时间
        /// </summary>
        public System.DateTime? OverTime { get; set; }


        #endregion Model


 CY_ECommercePlatform/CY.SQLDAL/OA/CoreCmsPlanOrderItemDAL.cs

@@ -192,7 +192,7 @@
        /// <returns></returns>
        public IEnumerable<Model.CoreDeliverOrderItem> GetDeliverModelsByZongOrderid(int orderkeyid)
        {
            return _dataBase.SelectModel<Model.CoreDeliverOrderItem>(" a.*,b.[OrderId] as  PlanOrderId,b.[MakeTime],b.[OrderState]  ", " [CoreDeliverOrderItem] a Inner Join [CoreDeliverOrder] as b On(a.[OrderID]=b.[id] ) Inner Join [CoreCmsPlanOrder] as c On(b.[OrderID]=c.[id] )  ", " c.[orderkeyid] = " + orderkeyid + " and ( b.[OrderState] = 1 or b.[OrderState] = 2)") as IList<Model.CoreDeliverOrderItem>;//执行查询
            return _dataBase.SelectModel<Model.CoreDeliverOrderItem>(" a.*,b.[OrderId] as  PlanOrderId,b.[MakeTime],b.[OrderState]  ", " [CoreDeliverOrderItem] a Inner Join [CoreDeliverOrder] as b On(a.[OrderID]=b.[id] ) Inner Join [CoreCmsPlanOrder] as c On(b.[OrderID]=c.[id] )  ", " c.[orderkeyid] = " + orderkeyid + " and   b.[OrderState] = 2 ") as IList<Model.CoreDeliverOrderItem>;//执行查询
        }



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

@@ -168,9 +168,9 @@
                             <th style="text-align: center">
                                客户名称
                            </th>
                            <th style="text-align: center">
                          <%--  <th style="text-align: center">
                                印件名称
                            </th>
                            </th>--%>
                             <th style="text-align: center">
                                数量
                            </th>
@@ -202,9 +202,9 @@
                                    <a href='javascript:void(0)' title='<%#Eval("BuyerName").ToString()%>' class='a_under' onclick='View("<%#Eval("BuyerId")%>")'><%#Eval("BuyerName").ToString().Length > 22 ? (Eval("BuyerName").ToString().Substring(0, 22) + "..") : Eval("BuyerName").ToString()%></a>
                                        </div>
                                </td>
                        <td style="text-align: center">
                       <%-- <td style="text-align: center">
                           <%#Eval("DocumentName")%>
                        </td>
                        </td>--%>
                         <td style="text-align: center">
                            <%#Eval("OrderExtend.PrintNum")%>
                        </td>

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

@@ -72,7 +72,7 @@
            {
                var sss = EndDate.ToDateTime2().Value.AddDays(1);
                coreCmsPlanOrderFahuos = coreCmsPlanOrderFahuos.Where(x => x.createTime <= sss);
                coreCmsPlanOrderFahuosssssss = coreCmsPlanOrderFahuosssssss.Where(x => x.createTime <= sss);
                coreCmsPlanOrderFahuosssssss = coreCmsPlanOrderFahuosssssss.Where(x => x.createTime <= sss );
            }