From 8ca9d136d69ac111a2b99d5e30dd3e83c3f0b1ed Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 01 十二月 2025 13:15:40 +0800
Subject: [PATCH] 查看送货情况中,把“已送”的数字变成灰色  完成

---
 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs |   49 +++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs
index ff4394f..a14f092 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs
+++ b/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;
@@ -136,11 +136,11 @@
                         {
                             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>";
+                                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>";
                             }
                             else
                             {
-                                biaoge += " <td style=\"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;\" > " + Number + " </td> <td style=\"text-align:center\"> <span style=\"color:green;\" >" + (cmsPlanOrderItem.nums - LessNumber - Number) + " </span></td>";
                             }
                         }
                         else
@@ -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=\"color: grey;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);
@@ -231,11 +260,11 @@
                 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>";
+                    biaowei += " <td style=\"color: grey;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>";
+                    biaowei += " <td style=\"color: grey;text-align: center;\" > " + Number + " </td>  <td style=\"text-align:center\">  <span style=\"color:green;\" >" + (nums - LessNumber - Number) + " </span></td>";
                 }
 
 

--
Gitblit v1.9.1