送货单修改这几个地方，第一个，那个表格最上面那根线条和左边那根线条看粗细不一致，太细了， 感觉像打出来像断笔画。这是一个。第二个， 中间空的太多。我刚...

username@email.com

2025-11-21 50d433602441964d905abe6e516ad258ba66627d

 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;
@@ -79,11 +79,11 @@
            }

            var OrderState = this.selstatus.Value.Trim();
            if (!string.IsNullOrEmpty(OrderState))
            {
                var sss = OrderState.ToInt32().Value;
                coreDeliverOrderItems = coreDeliverOrderItems.Where(x => x.OrderState == sss);
            }
            //if (!string.IsNullOrEmpty(OrderState))
            //{
            //    var sss = OrderState.ToInt32().Value;
            //    coreDeliverOrderItems = coreDeliverOrderItems.Where(x => x.OrderState == sss);
            //}



@@ -98,7 +98,7 @@
                _inquiryCommonModel = SerializationHelper.DeSerialize(typeof(InquiryCommonModel), _eC_OrderPrintParameter.PrintParameter) as InquiryCommonModel;

            }
           var inquiryWorkBookModels  = _inquiryCommonModel.InquiryWorkBookList.OrderBy(x=>x.WorkBookNameTxt).ThenBy(x=>x.WorkBookSizeTxt);
           var inquiryWorkBookModels  = _inquiryCommonModel.InquiryWorkBookList.OrderBy(x=>x.WorkBookSizeTxt).ThenBy(x=>x.WorkBookNameTxt);
          
            if (string.IsNullOrEmpty(biaotou))
            {
@@ -112,29 +112,18 @@
                }
                biaotou +="</tr><tr>"+ biaotou2+ "</tr>";
            }
            biaowei = "   <td style=\"text-align:center\"> 合计 </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).Sum(x => x.nums);

                var coreDeliverOrderItems1 = coreDeliverOrderItems.Where(x => x.ZYBName == inquiryWorkBookModel.WorkBookNameTxt && x.ZYBSpecification == inquiryWorkBookModel.WorkBookSizeTxt);

                var Number = coreDeliverOrderItems1.Sum(x => x.Number);
                var LessNumber = coreDeliverOrderItems1.Sum(x => x.LessNumber);


                biaowei += " <td style=\"text-align:center\"> " + Number + " </td>  <td style=\"text-align:center\">  <span style=\"color:red;\" >" + (nums - LessNumber - Number) + " </span></td>";

            }



        
            foreach(var coreCmsPlanOrder  in coreCmsPlanOrders)
            List<int> PlanOrderid = new List<int>();


            foreach (var coreCmsPlanOrder  in coreCmsPlanOrders)
            {
                var cmsPlanOrderItems1 = cmsPlanOrderItems.Where(x => x.orderId == coreCmsPlanOrder.id);
                foreach (var inquiryWorkBookModel in inquiryWorkBookModels)
                {
                    string biaoge = "";
                    var cmsPlanOrderItem = cmsPlanOrderItems1.Where(x => x.name == inquiryWorkBookModel.WorkBookNameTxt && x.specification == inquiryWorkBookModel.WorkBookSizeTxt).FirstOrDefault();
                    if (cmsPlanOrderItem != null)
                    {
@@ -143,21 +132,148 @@
                        var Number = coreDeliverOrderItems1.Sum(x => x.Number);
                        var LessNumber = coreDeliverOrderItems1.Sum(x => x.LessNumber);

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

                        
                       
                    }
                    else
                    {
                        coreCmsPlanOrder.biaoge += " <td style=\"text-align:center\"> 0 </td> <td style=\"text-align:center\"> <span style=\"color:red;\" >0</span></td> ";
                        biaoge += " <td style=\"text-align:center\">  </td> <td style=\"text-align:center\"> <span style=\"color:green;\" ></span></td> ";
                    }
                   

                    if (string.IsNullOrEmpty(OrderState))
                    {
                       
                        if (string.IsNullOrEmpty(diyici))
                        {
                            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")
                    {
                        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 (OrderState == "1")
                    {
                        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 + 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 == "2")
                    {
                        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 + jieyueshuliang >= jihuashuliang && jihuashuliang>0)
                        {
                            coreCmsPlanOrder.biaoge += biaoge;
                            if (PlanOrderid.Count(x => x == coreCmsPlanOrder.id) == 0)
                            {
                                PlanOrderid.Add(coreCmsPlanOrder.id);
                            }
                        }
                    }


                }

            }

             


            this.RepClientList.DataSource = coreCmsPlanOrders;
            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);

                var coreDeliverOrderItems1 = coreDeliverOrderItems.Where(x => x.ZYBName == inquiryWorkBookModel.WorkBookNameTxt && x.ZYBSpecification == inquiryWorkBookModel.WorkBookSizeTxt && PlanOrderid.Contains(x.PlanOrderId));

                var Number = coreDeliverOrderItems1.Sum(x => x.Number);
                var LessNumber = coreDeliverOrderItems1.Sum(x => x.LessNumber);
                if ((nums - LessNumber - Number) > 0)
                {
                    biaowei += " <td style=\"text-align:center\"> " + Number + " </td>  <td style=\"text-align:center\">  <span style=\"color:red;\" >" + (nums - LessNumber - Number) + " </span></td>";
                }
                else
                {
                    biaowei += " <td style=\"text-align:center\"> " + Number + " </td>  <td style=\"text-align:center\">  <span style=\"color:green;\" >" + (nums - LessNumber - Number) + " </span></td>";
                }



            }



            this.RepClientList.DataSource = coreCmsPlanOrders.Where(x=> PlanOrderid.Contains(x.id));
            this.RepClientList.DataBind();
            
        }