送货情况只查已送的 完成 以送货完成的时间为准来查询。 完成

username@email.com

昨天 5af3a0cbd911adbdc2dd98e08008c4fbd50530d9

送货情况只查已送的  完成
以送货完成的时间为准来查询。   完成

已送  改为这次送的数量

每个品种的“已送”、“未送”后面增加“节约”

 CY_ECommercePlatform/CY.BLL/OA/CoreDeliverOrderBLL.cs

@@ -249,10 +249,10 @@


            if (!string.IsNullOrEmpty(createTimeStart))
                Condition += " and DATEDIFF(day,a.[MakeTime],'" + createTimeStart + "')<=0 ";
                Condition += " and DATEDIFF(day,a.[OverTime],'" + createTimeStart + "')<=0 ";

            if (!string.IsNullOrEmpty(createTimeEnd))
                Condition += " and DATEDIFF(day,a.[MakeTime],'" + createTimeEnd + "')>=0 ";
                Condition += " and DATEDIFF(day,a.[OverTime],'" + createTimeEnd + "')>=0 ";




 CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuFukuanAdd.aspx.cs

@@ -334,7 +334,7 @@
                                return;
                            }
                        }
                        var oA_SubjectSet = _OA_SubjectSetBLL.getAllSubject(CurrentUser.MemberId, "贷").Where(x => x.SubjectName == "维修配件").FirstOrDefault();
                        var oA_SubjectSet = _OA_SubjectSetBLL.getAllSubject(CurrentUser.MemberId, "贷").Where(x => x.SubjectName == "维修付款").FirstOrDefault();
                        if (oA_SubjectSet != null)
                        {
                            m_OA_WorkPlan.RewardResult = oA_SubjectSet.Keyid.ToString();

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

@@ -65,7 +65,7 @@
                this.selBuyerName.DataValueField = "Keyid";
                this.selBuyerName.DataBind();
                //this.selBuyerName.Items.Insert(0, new ListItem("全部", ""));
                this.txtBeginDate.Value = DateTime.Now.AddDays(1).ToString("yyyy-MM-dd");
                //this.txtBeginDate.Value = DateTime.Now.AddDays(1).ToString("yyyy-MM-dd");
                var stringBuyerName = CACHE.RetrieveObject(CurrentUser.TrueMemberId + "BuyerName") as string;//从缓存中获取数据访问实现层程序集
                if (null != stringBuyerName)
                {

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

@@ -135,16 +135,16 @@
                    <td>
                        <input id='txtXuexiao' runat="server" maxlength='50' />
                    </td>
                  <td class="ali03">
                  <td class="ali03" style="display:none;">
                        送货状态：
                    </td>
                    <td>
                    <td style="display:none;" >
                        <select keepdefaultstyle='true' id='selOrderState' runat="server" >
                            <option value="">请选择</option>
                             <option value="4" selected="selected" >未完成</option>
                          <%--  <option value="">请选择</option>
                             <option value="4"  >未完成</option>
                            <option value="0">未送</option>
                            <option value="1">配送中</option>
                            <option value="2">已送</option>
                            <option value="1">配送中</option>--%>
                            <option value="2" selected="selected" >已送</option>
                        </select>
                    </td>
                     
@@ -195,7 +195,7 @@
                            <%#Container.ItemIndex + 1 %>
                        </td>
                        <td style="text-align: center;white-space: nowrap;">
                          <%#Eval("MakeTime", "{0:yyyy-MM-dd HH:mm}")%>
                          <%#Eval("OverTime", "{0:yyyy-MM-dd HH:mm}")%>
                        </td>
                           
                       <%-- <td style="text-align: center">

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

@@ -65,7 +65,7 @@
                this.selBuyerName.DataValueField = "Keyid";
                this.selBuyerName.DataBind();
                //this.selBuyerName.Items.Insert(0, new ListItem("全部", ""));
                this.txtEndDate.Value = DateTime.Now.ToString("yyyy-MM-dd");
                //this.txtEndDate.Value = DateTime.Now.ToString("yyyy-MM-dd");
                var stringBuyerName = CACHE.RetrieveObject(CurrentUser.TrueMemberId+ "BuyerName") as string;//从缓存中获取数据访问实现层程序集
                if (null != stringBuyerName)
                {
@@ -113,8 +113,8 @@
                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\" colspan=\"2\"> " + inquiryWorkBookModel.WorkBookSizeTxt + inquiryWorkBookModel.WorkBookNameTxt + " </th> ";
                    biaotou2 += " <th style=\"text-align:center\" > 已送 </th> <th style=\"text-align:center\" > 未送 </th> ";
                    biaotou += " <th style=\"text-align:center\" colspan=\"3\"> " + inquiryWorkBookModel.WorkBookSizeTxt + inquiryWorkBookModel.WorkBookNameTxt + " </th> ";
                    biaotou2 += " <th style=\"text-align:center\" > 已送 </th> <th style=\"text-align:center\" > 未送 </th><th style=\"text-align:center\" > 节约 </th> ";


                }
@@ -162,28 +162,39 @@
                        var Number = coreDeliverOrderItems1.Sum(x => x.Number);
                        var LessNumber = coreDeliverOrderItems1.Sum(x => x.LessNumber);

                        var coreDeliverOrderItem2 = coreDeliverOrderItems1.Where(x => x.OrderID == coreDeliverOrder.id).FirstOrDefault();
                        var Numberbenci = 0;
                        var LessNumberbenci = 0;
                        if (coreDeliverOrderItem2 != null)
                        {
                            Numberbenci = coreDeliverOrderItem2.Number;
                            LessNumberbenci = coreDeliverOrderItem2.LessNumber;
                        }
                       


                        if (cmsPlanOrderItem.nums > 0)
                        {
                            if (cmsPlanOrderItem.nums - LessNumber - Number > 0)
                            {
                                if (LessNumber + Number > 0)
                                {
                                    biaoge += " <td style=\"color: grey;text-align: center;\" > " + Number + " </td>  <td style=\"text-align:center\">  <span style=\"color:#ff69b4;\" >" + (cmsPlanOrderItem.nums - LessNumber - Number) + " </span></td>";
                                    biaoge += " <td style=\"color: grey;text-align: center;\" > " + Numberbenci + " </td>  <td style=\"text-align:center\">  <span style=\"color:#ff69b4;\" >" + (cmsPlanOrderItem.nums - LessNumber - Number) + " </span></td><td style=\"color: grey;text-align: center;\" > " + LessNumberbenci + " </td> ";
                                }
                                else
                                {
                                    biaoge += " <td style=\"color: grey;text-align: center;\" > " + Number + " </td> <td style=\"text-align:center\"> <span style=\"color:red;\" >" + (cmsPlanOrderItem.nums - LessNumber - Number) + " </span></td>";
                                    biaoge += " <td style=\"color: grey;text-align: center;\" > " + Numberbenci + " </td> <td style=\"text-align:center\"> <span style=\"color:red;\" >" + (cmsPlanOrderItem.nums - LessNumber - Number) + " </span></td><td style=\"color: grey;text-align: center;\" > " + LessNumberbenci + " </td>";
                                }

                            }
                            else
                            {
                                biaoge += " <td style=\"color: grey;text-align: center;\" > " + Number + " </td> <td style=\"text-align:center\"> <span style=\"color:green;\" >" + (cmsPlanOrderItem.nums - LessNumber - Number) + " </span></td>";
                                biaoge += " <td style=\"color: grey;text-align: center;\" > " + Numberbenci + " </td> <td style=\"text-align:center\"> <span style=\"color:green;\" >" + (cmsPlanOrderItem.nums - LessNumber - Number) + " </span></td><td style=\"color: grey;text-align: center;\" > " + LessNumberbenci + " </td>";
                            }
                        }
                        else
                        {
                            biaoge += " <td style=\"text-align:center\">  </td> <td style=\"text-align:center\"> <span style=\"color:green;\" ></span></td> ";
                            biaoge += " <td style=\"text-align:center\">  </td> <td style=\"text-align:center\"> <span style=\"color:green;\" ></span></td> <td style=\"text-align:center\"> <span style=\"color:green;\" ></span></td>";
                        }


@@ -191,7 +202,7 @@
                    }
                    else
                    {
                        biaoge += " <td style=\"text-align:center\">  </td> <td style=\"text-align:center\"> <span style=\"color:green;\" ></span></td> ";
                        biaoge += " <td style=\"text-align:center\">  </td> <td style=\"text-align:center\"> <span style=\"color:green;\" ></span></td><td style=\"text-align:center\"> <span style=\"color:green;\" ></span></td> ";
                    }


@@ -221,17 +232,17 @@
                {
                    if (LessNumber + Number > 0)
                    {
                        biaowei += " <td style=\"color: grey;text-align: center;\" > " + Number + " </td>  <td style=\"text-align:center\">  <span style=\"color:#ff69b4;\" >" + (nums - LessNumber - Number) + " </span></td>";
                        biaowei += " <td style=\"color: grey;text-align: center;\" > " + Number + " </td>  <td style=\"text-align:center\">  <span style=\"color:#ff69b4;\" >" + (nums - LessNumber - Number) + " </span></td><td style=\"color: grey;text-align: center;\" > " + LessNumber + " </td>";
                    }
                    else
                    {
                        biaowei += " <td style=\"color: grey;text-align: center;\" > " + Number + " </td>  <td style=\"text-align:center\">  <span style=\"color:red;\" >" + (nums - LessNumber - Number) + " </span></td>";
                        biaowei += " <td style=\"color: grey;text-align: center;\" > " + Number + " </td>  <td style=\"text-align:center\">  <span style=\"color:red;\" >" + (nums - LessNumber - Number) + " </span></td><td style=\"color: grey;text-align: center;\" > " + LessNumber + " </td>";
                    }

                }
                else
                {
                    biaowei += " <td style=\"color: grey;text-align: center;\" > " + Number + " </td>  <td style=\"text-align:center\">  <span style=\"color:green;\" >" + (nums - LessNumber - Number) + " </span></td>";
                    biaowei += " <td style=\"color: grey;text-align: center;\" > " + Number + " </td>  <td style=\"text-align:center\">  <span style=\"color:green;\" >" + (nums - LessNumber - Number) + " </span></td><td style=\"color: grey;text-align: center;\" > " + LessNumber + " </td>  ";
                }