CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs
@@ -41,13 +41,13 @@
            {
                 
                BindList();
                BindList("diyici");
            }
             
        }
        //绑定数据
        private void BindList()
        private void BindList(string diyici="")
        {
            string orderIdStr = Request["orderId"];
            this.hideOrderId.Value = orderIdStr;
@@ -158,11 +158,40 @@
                    if (string.IsNullOrEmpty(OrderState))
                    {
                        coreCmsPlanOrder.biaoge += biaoge;
                        if(PlanOrderid.Count(x=>x == coreCmsPlanOrder.id) == 0)
                        if (string.IsNullOrEmpty(diyici))
                        {
                            PlanOrderid.Add(coreCmsPlanOrder.id);
                            coreCmsPlanOrder.biaoge += biaoge;
                            if (PlanOrderid.Count(x => x == coreCmsPlanOrder.id) == 0)
                            {
                                PlanOrderid.Add(coreCmsPlanOrder.id);
                            }
                        }
                        else
                        {
                            var jihuashuliang = cmsPlanOrderItems1.Sum(x => x.nums);
                            var coreDeliverOrderItems2 = coreDeliverOrderItems.Where(x => x.PlanOrderId == coreCmsPlanOrder.id);
                            var songhuoshuliang = coreDeliverOrderItems2.Sum(x => x.Number);
                            var jieyueshuliang = coreDeliverOrderItems2.Sum(x => x.LessNumber);
                            if (songhuoshuliang <= 0 && jieyueshuliang <= 0)
                            {
                                coreCmsPlanOrder.biaoge += biaoge;
                                if (PlanOrderid.Count(x => x == coreCmsPlanOrder.id) == 0)
                                {
                                    PlanOrderid.Add(coreCmsPlanOrder.id);
                                }
                            }
                            else if (songhuoshuliang + jieyueshuliang < jihuashuliang && jihuashuliang > 0 && songhuoshuliang + jieyueshuliang > 0)
                            {
                                coreCmsPlanOrder.biaoge += biaoge;
                                if (PlanOrderid.Count(x => x == coreCmsPlanOrder.id) == 0)
                                {
                                    PlanOrderid.Add(coreCmsPlanOrder.id);
                                }
                            }
                        }
                    }
                    else if (OrderState == "0")
                    {
@@ -220,7 +249,7 @@
            biaowei = "   <td style=\"text-align:center\"> 合计 </td><td style=\"text-align:center\">  </td> <td style=\"text-align:center\">  </td> ";
            biaowei = "   <td style=\"text-align:center\"> "+ PlanOrderid.Count +" </td><td style=\"text-align:center\">  </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 && PlanOrderid.Contains(x.orderId)).Sum(x => x.nums);