CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiDetail.aspx.cs
@@ -61,7 +61,7 @@ var coreDeliverOrder = _CoreDeliverOrderBLL.GetModelByKeyid(orderIdStr); var coreCmsPlanOrder = _CoreCmsPlanOrderBLL.GetModelByKeyid(coreDeliverOrder.OrderId.Value); var cmsPlanOrderItems = _CoreCmsPlanOrderItemBLL.GetModelsByOrderid(coreDeliverOrder.OrderId.Value); var coreDeliverOrderItems = _CoreDeliverOrderItemBLL.GetModelsByOrderid(orderIdStr); var coreDeliverOrderItems = _CoreDeliverOrderItemBLL.GetModelsByOrderid(orderIdStr).OrderBy(x=>x.ZYBSpecification).ThenBy(x=>x.ZYBName);
@@ -61,7 +61,7 @@ var coreDeliverOrder = _CoreDeliverOrderBLL.GetModelByKeyid(orderIdStr); var coreCmsPlanOrder = _CoreCmsPlanOrderBLL.GetModelByKeyid(coreDeliverOrder.OrderId.Value); var cmsPlanOrderItems = _CoreCmsPlanOrderItemBLL.GetModelsByOrderid(coreDeliverOrder.OrderId.Value); var coreDeliverOrderItems = _CoreDeliverOrderItemBLL.GetModelsByOrderid(orderIdStr); var coreDeliverOrderItems = _CoreDeliverOrderItemBLL.GetModelsByOrderid(orderIdStr).OrderBy(x => x.ZYBSpecification).ThenBy(x => x.ZYBName); ;
@@ -60,7 +60,7 @@ this.selDriver.Items.Insert(0, new ListItem("全部", "")); this.selBuyerName.DataSource = bll_EC_OrderBasicBLL.GetOrderByPrintTypeId(37).Where(x => x.OrderState == 4 || x.OrderState == 2 || x.OrderState == 3).OrderByDescending(x => x.CreateTime); ; this.selBuyerName.DataSource = bll_EC_OrderBasicBLL.GetOrderByPrintTypeId(37).Where(x => x.OrderState == 4 || x.OrderState == 2 || x.OrderState == 3).OrderBy(x => x.CreateTime); this.selBuyerName.DataTextField = "BuyerName"; this.selBuyerName.DataValueField = "Keyid"; this.selBuyerName.DataBind(); CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx
@@ -178,9 +178,9 @@ <th style="text-align: center"> 司机 </th> <th style="text-align: center"> <%-- <th style="text-align: center"> 送货状态 </th> </th>--%> <%=biaotou %> <%-- <th style="text-align: center"> @@ -211,9 +211,9 @@ <td style="text-align: center"> <%#Eval("DriverName")%> </td> <td style="text-align: center"> <%-- <td style="text-align: center"> <%#Eval("OrderStateName")%> </td> </td>--%> <%#Eval("biaoge")%> <td class="Operate " style="text-align: center"> <span onclick="onViewCarInsurance('<%#Eval("id")%>')">查看明细</span> CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx.cs
@@ -60,7 +60,7 @@ this.selDriver.Items.Insert(0, new ListItem("全部", "")); this.selBuyerName.DataSource = bll_EC_OrderBasicBLL.GetOrderByPrintTypeId(37).Where(x => x.OrderState == 4 || x.OrderState == 2 || x.OrderState == 3).OrderByDescending(x=>x.CreateTime); this.selBuyerName.DataSource = bll_EC_OrderBasicBLL.GetOrderByPrintTypeId(37).Where(x => x.OrderState == 4 || x.OrderState == 2 || x.OrderState == 3).OrderBy(x => x.CreateTime); this.selBuyerName.DataTextField = "BuyerName"; this.selBuyerName.DataValueField = "Keyid"; this.selBuyerName.DataBind(); @@ -110,7 +110,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> <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>"; foreach (var inquiryWorkBookModel in inquiryWorkBookModels) { biaotou += " <th style=\"text-align:center\" colspan=\"3\"> " + inquiryWorkBookModel.WorkBookSizeTxt + inquiryWorkBookModel.WorkBookNameTxt + " </th> "; @@ -219,7 +219,7 @@ } 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> "; 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> "; 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);
